[git commit master 1/1] FreeBSD compat

Denys Vlasenko vda.linux at googlemail.com
Mon Jan 24 16:07:06 UTC 2011


commit: http://git.busybox.net/busybox/commit/?id=330718ef5574d1f830e304107d2a43038aa6ff5c
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Chris Rees <utisoft at gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 include/libbb.h    |   15 +++++++++------
 include/platform.h |    3 +++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/include/libbb.h b/include/libbb.h
index aa7944a..e598823 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -38,12 +38,6 @@
 #include <time.h>
 #include <unistd.h>
 #include <sys/param.h>
-#ifndef HAVE_CLEARENV
-# define clearenv() do { if (environ) environ[0] = NULL; } while (0)
-#endif
-#ifndef HAVE_FDATASYNC
-# define fdatasync fsync
-#endif
 #ifdef HAVE_MNTENT_H
 # include <mntent.h>
 #endif
@@ -103,6 +97,15 @@
    typedef unsigned socklen_t;
 # endif
 #endif
+#ifndef HAVE_CLEARENV
+# define clearenv() do { if (environ) environ[0] = NULL; } while (0)
+#endif
+#ifndef HAVE_FDATASYNC
+# define fdatasync fsync
+#endif
+#ifndef HAVE_XTABS
+# define XTABS TAB3
+#endif
 
 
 /* Some libc's forget to declare these, do it ourself */
diff --git a/include/platform.h b/include/platform.h
index 2bc88c3..9d6e216 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -262,9 +262,12 @@ typedef uint32_t bb__aliased_uint32_t FIX_ALIASING;
 # undef HAVE_PTSNAME_R
 # undef HAVE_SYS_STATFS_H
 # undef HAVE_SIGHANDLER_T
+# undef HAVE_XTABS
+# undef HAVE_FDPRINTF
 #else
 # define HAVE_MNTENT_H 1
 # define HAVE_SYS_STATFS_H 1
+# define HAVE_XTABS 1
 #endif
 
 /*----- Kernel versioning ------------------------------------*/
-- 
1.7.3.4



More information about the busybox-cvs mailing list