Changeset 809 in kBuild for trunk/src/gmake/kmkbuiltin/ftsfake.h

Timestamp:

Jan 29, 2007 5:54:36 AM (18 years ago)

Author:

bird

Message:

Solaris + cleanup.

File:

• trunk/src/gmake/kmkbuiltin/ftsfake.h (modified) (7 diffs)

trunk/src/gmake/kmkbuiltin/ftsfake.h

@@ -35 +35 @@
 #define _FTS_H_
 
+#ifdef _MSC_VER
+# include "kmkbuiltin/mscfakes.h"
+#endif
+
 typedef struct {
         struct _ftsent *fts_cur;        /* current node */
@@ -60 +64 @@
 #ifndef _MSC_VER
 #define FTS_WHITEOUT    0x080           /* return whiteout information */
-#endif 
+#endif
 #define FTS_OPTIONMASK  0x0ff           /* valid user option mask */
 
@@ -79 +83 @@
 #ifndef _MSC_VER
         int fts_symfd;                  /* fd for symlink */
-#endif 
+#endif
         u_short fts_pathlen;            /* strlen(fts_path) */
         u_short fts_namelen;            /* strlen(fts_name) */
@@ -92 +96 @@
 #else
         int fts_nlink;          /* link count */
-#endif 
+#endif
 #endif
 
@@ -121 +125 @@
 #ifndef _MSC_VER
 #define FTS_ISW          0x04           /* this is a whiteout object */
-#endif 
+#endif
         u_short fts_flags;              /* private flags for FTSENT structure */
 
@@ -138 +142 @@
 } FTSENT;
 
+#ifndef __sun__
 #ifndef _MSC_VER
 #include <sys/cdefs.h>
 __BEGIN_DECLS
 #else
-#define __RENAME(a) 
-#endif 
+#define __RENAME(a)
+#endif
+#endif
 
-#ifdef __LIBC12_SOURCE__
+#if defined(__LIBC12_SOURCE__) || defined(__sun__)
 FTSENT  *fts_children(FTS *, int);
 int      fts_close(FTS *);
@@ -162 +168 @@
 #endif
 
+#ifndef __sun__
 #ifndef _MSC_VER
 __END_DECLS
 #endif
+#endif
 
 #endif /* !_FTS_H_ */