Changeset 168 for trunk/src/makedep/include.c

Timestamp:

Oct 13, 2004, 4:06:32 AM (21 years ago)

Author:

bird

Message:

Merged in mozilla changes and config.

File:

• trunk/src/makedep/include.c (modified) (5 diffs)

trunk/src/makedep/include.c

@@ -29 +29 @@
 
 #include "def.h"
+
+/* mozilla: */
+#ifdef _MSC_VER
+#define S_ISDIR(m) (((m) & _S_IFDIR) == _S_IFDIR)
+#endif
 
 extern struct   inclist inclist[ MAXFILES ],
@@ -119 +124 @@
                     char **tp = cp;
 
-                    do 
+                    do
                         *tp++ = *fp; /* move all the pointers down */
                     while (*fp++);
@@ -267 +272 @@
                     (type == INCLUDENEXTDOT) ||
                     (*include == '/')) {
-                        if (stat(include, &st) == 0)
+                        if (stat(include, &st) == 0 && !S_ISDIR(st.st_mode)) /* mozilla */
                                 return newinclude(include, include);
                         if (show_where_not)
@@ -289 +294 @@
                         }
                         remove_dotdot(path);
-                        if (stat(path, &st) == 0)
+                        if (stat(path, &st) == 0 && !S_ISDIR(st.st_mode)) /* mozilla */
                                 return newinclude(path, include);
                         if (show_where_not)
@@ -307 +312 @@
                 sprintf(path, "%s/%s", *pp, include);
                 remove_dotdot(path);
-                if (stat(path, &st) == 0) {
+                if (stat(path, &st) == 0 && !S_ISDIR(st.st_mode)) { /* mozilla */
                         includedirsnext = pp + 1;
                         return newinclude(path, include);