fix dependencies on X11 source tree (oops :-)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3744 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/util/makedepend/def.h b/src/util/makedepend/def.h
index 60477417a95bd5c560b1e5694decc1897c675f37..2d8c1b4bb3fac753466a120c90b854958bff1421 100644 (file)
--- 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 6d961bad20858bcee77dd05a87baed264e2f3e79..ccf35147cfc5eb25374fd358b11bd2210f401525 100644 (file)
--- 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>