Changeset 168 in kBuild for trunk/src/makedep/def.h

Timestamp:

Oct 13, 2004 2:06:32 AM (20 years ago)

Author:

bird

Message:

Merged in mozilla changes and config.

File:

• trunk/src/makedep/def.h (modified) (4 diffs)

trunk/src/makedep/def.h

@@ -27 +27 @@
 /* $XFree86: xc/config/makedepend/def.h,v 3.13tsi Exp $ */
 
-#include "Xos.h"
-#include "Xfuncproto.h"
+#ifndef NO_X11 /* from mozilla */
+#include "X11/Xos.h"
+#include "X11/Xfuncproto.h"
+#endif
 #include <stdlib.h>
 #include <stdio.h>
@@ -81 +83 @@
 /*
  * debug levels are:
- * 
+ *
  *     0        show ifn*(def)*,endif
  *     1        trace defined/!defined
@@ -148 +150 @@
                                    struct inclist **srcfile);
 struct filepointer      *getfile(char *file);
-void                    included_by(struct inclist *ip, 
+void                    included_by(struct inclist *ip,
                                     struct inclist *newfile);
 struct inclist          *newinclude(char *newfile, char *incstring);
@@ -159 +161 @@
 void                    define(char *def, struct inclist *file);
 void                    undefine(char *symbol, struct inclist *file);
-int                     find_includes(struct filepointer *filep, 
-                                      struct inclist *file, 
-                                      struct inclist *file_red, 
+int                     find_includes(struct filepointer *filep,
+                                      struct inclist *file,
+                                      struct inclist *file_red,
                                       int recursion, boolean failOK);
 
-void                    recursive_pr_include(struct inclist *head, 
+void                    recursive_pr_include(struct inclist *head,
                                              char *file, char *base);
-void                    add_include(struct filepointer *filep, 
-                                    struct inclist *file, 
-                                    struct inclist *file_red, 
+void                    add_include(struct filepointer *filep,
+                                    struct inclist *file,
+                                    struct inclist *file_red,
                                     char *include, int type,
                                     boolean failOK);