diff options
| author | dawes <dawes> | 2001-07-30 14:29:21 +0000 |
|---|---|---|
| committer | dawes <dawes> | 2001-07-30 14:29:21 +0000 |
| commit | 27f4b9bfe70a53f61a40ae1134282356a17ecf06 (patch) | |
| tree | ba40dc914e2bfd54ff21b2747cd2144b1fba781c /xc/lib/X11/Font.c | |
| parent | fa75268be48b8af92f699da86665fe72d3f29691 (diff) | |
Merge from trunk.
Diffstat (limited to 'xc/lib/X11/Font.c')
| -rw-r--r-- | xc/lib/X11/Font.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/xc/lib/X11/Font.c b/xc/lib/X11/Font.c index 29d98a9d9..7fa5922e7 100644 --- a/xc/lib/X11/Font.c +++ b/xc/lib/X11/Font.c @@ -28,7 +28,7 @@ sale, use or other dealings in this Software without prior written authorization from the X Consortium and the XFree86 Project. */ -/* $XFree86: xc/lib/X11/Font.c,v 1.12 2001/01/17 19:41:35 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Font.c,v 1.13 2001/05/01 07:53:46 alanh Exp $ */ #define NEED_REPLIES #include "Xlibint.h" @@ -39,11 +39,7 @@ authorization from the X Consortium and the XFree86 Project. #ifdef USE_XF86BIGFONT #include <sys/types.h> #ifdef HAS_SHM -#ifndef __CYGWIN__ #include <sys/ipc.h> -#else -#include <sys/cygipc.h> -#endif #include <sys/shm.h> #endif |