diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-10-31 17:57:13 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-10-31 17:57:13 +0000 |
| commit | 2c25b805f5ece73cb8ea248177211266510b4b7d (patch) | |
| tree | 98693ee4e8b712b5e0e7183e96890a076e539e42 /lib/libXfont/include/X11/fonts/fontmisc.h | |
| parent | e37408906ed9e62da47bf754bed3ec3908e9d80a (diff) | |
Update to libXfont 1.4.1
Diffstat (limited to 'lib/libXfont/include/X11/fonts/fontmisc.h')
| -rw-r--r-- | lib/libXfont/include/X11/fonts/fontmisc.h | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/lib/libXfont/include/X11/fonts/fontmisc.h b/lib/libXfont/include/X11/fonts/fontmisc.h index 7b8651706..ed5fd1930 100644 --- a/lib/libXfont/include/X11/fonts/fontmisc.h +++ b/lib/libXfont/include/X11/fonts/fontmisc.h @@ -1,5 +1,3 @@ -/* $Xorg: fontmisc.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ - /* Copyright 1991, 1998 The Open Group @@ -34,19 +32,10 @@ in this Software without prior written authorization from The Open Group. #ifndef _FONTMISC_H_ #define _FONTMISC_H_ -#ifndef FONTMODULE #include <X11/Xfuncs.h> #include <stdlib.h> #include <stdio.h> - -#ifndef X_NOT_POSIX #include <unistd.h> -#else -extern int close(); -#endif - -#endif /* FONTMODULE */ - #include <X11/Xdefs.h> @@ -68,32 +57,11 @@ extern Atom MakeAtom ( char *string, unsigned len, int makeit ); extern int ValidAtom ( Atom atom ); extern char *NameForAtom (Atom atom); -#ifndef _HAVE_XALLOC_DECLS -#define _HAVE_XALLOC_DECLS -extern pointer Xalloc(unsigned long); -extern pointer Xrealloc(pointer, unsigned long); -extern void Xfree(pointer); -extern pointer Xcalloc(unsigned long); -#endif -extern int f_strcasecmp(const char *s1, const char *s2); - -#ifndef xalloc -#define xalloc(n) Xalloc ((unsigned) n) -#define xfree(p) Xfree ((pointer) p) -#define xrealloc(p,n) Xrealloc ((pointer)p,n) -#define xcalloc(n,s) Xcalloc((unsigned) n * (unsigned) s) -#endif #define lowbit(x) ((x) & (~(x) + 1)) #undef assert #define assert(x) ((void)0) -#ifndef strcasecmp -#if defined(NEED_STRCASECMP) && !defined(FONTMODULE) -#define strcasecmp(s1,s2) f_strcasecmp(s1,s2) -#endif -#endif - extern void BitOrderInvert( register unsigned char *, |