diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-07-18 18:16:12 -0400 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-07-18 18:17:38 -0400 |
| commit | 84683f19b4d1c712281036bcabf8dc623e64b26a (patch) | |
| tree | 94c61eca298da6f6200fcb8ba8a4d1009b1495b7 /include/os.h | |
| parent | 881953813c7307f2aac4057b48d233e5f4a574cd (diff) | |
get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE
Get rid of almost all uses of these definitions. They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build. As well as
for miinitext.c. But largely gone.
Diffstat (limited to 'include/os.h')
| -rw-r--r-- | include/os.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/include/os.h b/include/os.h index 0885bb298..e16839c74 100644 --- a/include/os.h +++ b/include/os.h @@ -88,12 +88,8 @@ typedef struct _NewClientRec *NewClientPtr; #define xnfstrdup(s) XNFstrdup(s) #endif -#ifndef IN_MODULE -#ifdef __SCO__ #include <stdio.h> -#endif -#include <string.h> -#endif +#include <stdarg.h> /* have to put $(SIGNAL_DEFINES) in DEFINES in Imakefile to get this right */ #ifdef SIGNALRETURNSINT @@ -517,10 +513,4 @@ extern void ErrorF(const char *f, ...) _printf_attribute(1,2); extern void Error(char *str); extern void LogPrintMarkers(void); -#if defined(NEED_SNPRINTF) && !defined(IN_MODULE) -extern int snprintf(char *str, size_t size, const char *format, ...) - _printf_attribute(3,4); -extern int vsnprintf(char *str, size_t size, const char *format, va_list ap); -#endif - #endif /* OS_H */ |