diff options
Diffstat (limited to 'xc/lib/FS/FSlib.h')
| -rw-r--r-- | xc/lib/FS/FSlib.h | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/xc/lib/FS/FSlib.h b/xc/lib/FS/FSlib.h index 0bdd39b4e..5bd5c2c29 100644 --- a/xc/lib/FS/FSlib.h +++ b/xc/lib/FS/FSlib.h @@ -1,4 +1,4 @@ -/* $TOG: FSlib.h /main/10 1998/02/06 13:43:12 kaleb $ */ +/* $Xorg: FSlib.h,v 1.4 2000/08/17 19:44:05 cpqbld Exp $ */ /* * Copyright 1990 Network Computing Devices; @@ -24,7 +24,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSlib.h,v 1.3 1999/02/20 15:07:14 hohndel Exp $ */ +/* $XFree86: xc/lib/FS/FSlib.h,v 1.4 2001/01/17 19:41:28 dawes Exp $ */ /* @@ -55,8 +55,8 @@ in this Software without prior written authorization from The Open Group. #ifndef _FSLIB_H_ #define _FSLIB_H_ -#include <FS.h> -#include <FSproto.h> +#include <X11/fonts/FS.h> +#include <X11/fonts/FSproto.h> #define Bool int #define Status int @@ -74,19 +74,9 @@ in this Software without prior written authorization from The Open Group. #define FSAuthorizationData(svr) ((svr)->auth_data) #define FSAlternateServers(svr) ((svr)->alternate_servers) #define FSNumAlternateServers(svr) ((svr)->num_alternates) - -#ifdef QLength -#undef QLength -#endif -#define QLength(svr) ((svr)->qlen) -#ifdef NextRequest -#undef NextRequest -#endif -#define NextRequest(svr) ((svr)->request + 1) -#ifdef LastKnownRequestProcessed -#undef LastKnownRequestProcessed -#endif -#define LastKnownRequestProcessed(svr) ((svr)->last_request_read) +#define FSQLength(svr) ((svr)->qlen) +#define FSNextRequest(svr) ((svr)->request + 1) +#define FSLastKnownRequestProcessed(svr) ((svr)->last_request_read) #define FSAllocID(svr) ((*(svr)->resource_alloc)((svr))) |