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/bufio.h | |
| parent | e37408906ed9e62da47bf754bed3ec3908e9d80a (diff) | |
Update to libXfont 1.4.1
Diffstat (limited to 'lib/libXfont/include/X11/fonts/bufio.h')
| -rw-r--r-- | lib/libXfont/include/X11/fonts/bufio.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/libXfont/include/X11/fonts/bufio.h b/lib/libXfont/include/X11/fonts/bufio.h index da90064a2..f8e58151e 100644 --- a/lib/libXfont/include/X11/fonts/bufio.h +++ b/lib/libXfont/include/X11/fonts/bufio.h @@ -34,13 +34,6 @@ from The Open Group. #include <X11/Xfuncproto.h> -#ifdef TEST - -#define xalloc(s) malloc(s) -#define xfree(s) free(s) - -#endif - #define BUFFILESIZE 8192 #define BUFFILEEOF -1 @@ -71,11 +64,12 @@ extern BufFilePtr BufFilePushCompressed ( BufFilePtr ); #ifdef X_GZIP_FONT_COMPRESSION extern BufFilePtr BufFilePushZIP ( BufFilePtr ); #endif +#ifdef X_BZIP2_FONT_COMPRESSION +extern BufFilePtr BufFilePushBZIP2 ( BufFilePtr ); +#endif extern int BufFileClose ( BufFilePtr, int ); -extern int BufFileFlush ( BufFilePtr, int ); extern int BufFileRead ( BufFilePtr, char*, int ); extern int BufFileWrite ( BufFilePtr, char*, int ); -extern void BufFileFree ( BufFilePtr ); #define BufFileGet(f) ((f)->left-- ? *(f)->bufp++ : ((f)->eof = (*(f)->input) (f))) #define BufFilePut(c,f) (--(f)->left ? *(f)->bufp++ = ((unsigned char)(c)) : (*(f)->output) ((unsigned char)(c),f)) |