Changeset 2145 in kBuild for trunk/src

Timestamp:

Dec 26, 2008 12:54:01 PM (16 years ago)

Author:

bird

Message:

kmk: use our fts everywhere.

Location:

trunk/src/kmk

Files:

• Makefile.kmk (modified) (4 diffs)
• config.h.darwin (modified) (2 diffs)
• kmkbuiltin/ftsfake.h (modified) (2 diffs)

trunk/src/kmk/Makefile.kmk

@@ -38 +38 @@
         KBUILD_SVN_REV=$(KBUILD_SVN_REV) \
         KBUILD_TYPE=\"$(KBUILD_TYPE)\"
-TEMPLATE_BIN-KMK_DEPS = $(PATH_kmk)/config.h
+TEMPLATE_BIN-KMK_DEPS = \
+        $(PATH_kmk)/config.h \
+        $(PATH_kmk)/fts.h
 TEMPLATE_BIN-KMK_CLEAN = $(TEMPLATE_BIN-KMK_DEPS)
 TEMPLATE_BIN-KMK_DEPS.solaris = \
-        $(PATH_kmk)/fts.h \
         $(PATH_kmk)/paths.h
 TEMPLATE_BIN-KMK_CLEAN.solaris = $(TEMPLATE_BIN-KMK_DEPS.solaris)
 TEMPLATE_BIN-KMK_DEPS.win     = \
-        $(PATH_kmk)/fts.h \
         $(PATH_kmk)/sysexits.h \
         $(PATH_kmk)/unistd.h \
@@ -79 +79 @@
 kmkmissing_SOURCES = \
         kmkbuiltin/err.c \
+        kmkbuiltin/fts.c \
         kmkbuiltin/setmode.c \
         kmkbuiltin/strmode.c \
@@ -106 +107 @@
         kmkbuiltin/strlcpy.c \
         kmkbuiltin/solfakes.c \
-        kmkbuiltin/fts.c \
         glob/glob.c \
         glob/fnmatch.c
@@ -113 +113 @@
         kmkbuiltin/strlcpy.c \
         kmkbuiltin/mscfakes.c \
-        kmkbuiltin/fts.c \
         glob/glob.c \
         glob/fnmatch.c \

trunk/src/kmk/config.h.darwin

@@ -287 +287 @@
 
 /* Build host information. (not used by kmk) */
-#define MAKE_HOST "i686-apple-darwin8.8.1"
+#define MAKE_HOST "i386-apple-darwin9.4.0"
 
 /* Define to 1 to enable job server support in GNU make. */
@@ -427 +427 @@
 
 #include "inlined_memchr.h"
-

trunk/src/kmk/kmkbuiltin/ftsfake.h

@@ -142 +142 @@
 } FTSENT;
 
-#ifndef __sun__
-#ifndef _MSC_VER
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-#else
-#define __RENAME(a)
-#endif
+#ifdef __cplusplus
+extern "C" {
 #endif
 
-#if defined(__LIBC12_SOURCE__) || defined(__sun__)
 FTSENT  *fts_children(FTS *, int);
 int      fts_close(FTS *);
@@ -158 +152 @@
 FTSENT  *fts_read(FTS *);
 int      fts_set(FTS *, FTSENT *, int);
-#else
-FTSENT  *fts_children(FTS *, int)               __RENAME(__fts_children13);
-int      fts_close(FTS *)                       __RENAME(__fts_close13);
-FTS     *fts_open(char * const *, int,
-            int (*)(const FTSENT **, const FTSENT **))
-                                                __RENAME(__fts_open13);
-FTSENT  *fts_read(FTS *)                        __RENAME(__fts_read13);
-int      fts_set(FTS *, FTSENT *, int)  __RENAME(__fts_set13);
-#endif
 
-#ifndef __sun__
-#ifndef _MSC_VER
-__END_DECLS
-#endif
+#ifdef __cplusplus
+}
 #endif