summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/util/makedepend/def.h14
-rw-r--r--src/util/makedepend/main.c12
2 files changed, 2 insertions, 24 deletions
diff --git a/src/util/makedepend/def.h b/src/util/makedepend/def.h
index 60477417a..2d8c1b4bb 100644
--- a/src/util/makedepend/def.h
+++ b/src/util/makedepend/def.h
@@ -26,18 +26,8 @@ in this Software without prior written authorization from the X Consortium.
*/
-#include <X11/Xosdefs.h>
-#ifdef WIN32
-#include <X11/Xw32defs.h>
-#endif
-#include <X11/Xfuncproto.h>
#include <stdio.h>
#include <ctype.h>
-#ifndef X_NOT_POSIX
-#ifndef _POSIX_SOURCE
-#define _POSIX_SOURCE
-#endif
-#endif
#include <sys/types.h>
#include <fcntl.h>
#include <sys/stat.h>
@@ -118,7 +108,7 @@ struct filepointer {
long f_line;
};
-#ifndef X_NOT_STDC_ENV
+#ifndef NO_STDLIB_H /* X_NOT_STDC_ENV */
#include <stdlib.h>
#if defined(macII) && !defined(__STDC__) /* stdlib.h fails to define these */
char *malloc(), *realloc();
@@ -138,7 +128,7 @@ struct filepointer *getfile();
struct inclist *newinclude();
struct inclist *inc_path();
-#if NeedVarargsPrototypes
+#ifdef STDARG_PROTOTYPES /* NeedVarargsPrototypes */
extern fatalerr(char *, ...);
extern warning(char *, ...);
extern warning1(char *, ...);
diff --git a/src/util/makedepend/main.c b/src/util/makedepend/main.c
index 6d961bad2..ccf35147c 100644
--- a/src/util/makedepend/main.c
+++ b/src/util/makedepend/main.c
@@ -31,19 +31,7 @@ in this Software without prior written authorization from the X Consortium.
#define sigvec sigvector
#endif /* hpux */
-#ifdef X_POSIX_C_SOURCE
-#define _POSIX_C_SOURCE X_POSIX_C_SOURCE
#include <signal.h>
-#undef _POSIX_C_SOURCE
-#else
-#if defined(X_NOT_POSIX) || defined(_POSIX_SOURCE)
-#include <signal.h>
-#else
-#define _POSIX_SOURCE
-#include <signal.h>
-#undef _POSIX_SOURCE
-#endif
-#endif
#if NeedVarargsPrototypes
#include <stdarg.h>