Fixup to the previous (portability) patch. Linux actually does need

[oweals/busybox.git] / include / busybox.h

diff --git a/include/busybox.h b/include/busybox.h
index f6f575957215af775c7a8a0014bb4738e4785869..18f9dd56ef13d99b7e6c2cb329c90a9695d1761b 100644 (file)
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -2,51 +2,26 @@
 /*
  * Busybox main internal header file
  *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Based in part on code from sash, Copyright (c) 1999 by David I. Bell
- * Permission has been granted to redistribute this code under the GPL.
- *
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 #ifndef        _BB_INTERNAL_H_
 #define        _BB_INTERNAL_H_    1
 
-#include "config.h"
+#include "bb_config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 
-#if __GNU_LIBRARY__ < 5
-#ifndef __dietlibc__
-#error "Sorry, libc5 is not supported"
-#endif
-#endif
-
-#ifndef BB_EXTRA_VERSION
-#define BB_BANNER "BusyBox v" BB_VER " (" BB_BT ")"
-#else
-#define BB_BANNER "BusyBox v" BB_VER " (" BB_EXTRA_VERSION ")"
+#if __GNU_LIBRARY__ < 5 && \
+    !defined(__dietlibc__) && \
+    !defined(_NEWLIB_VERSION)
+#error "Sorry, this libc version is not supported :("
 #endif
 
-#ifdef DMALLOC
-#include <dmalloc.h>
-#endif
+extern const char BB_BANNER[];
 
 #include <features.h>
 
@@ -70,8 +45,8 @@ enum SUIDRoot {
 struct BB_applet {
        const char *name;
        int (*main) (int argc, char **argv);
-       enum Location location:4;
-       enum SUIDRoot need_suid:4;
+       __extension__ enum Location location:4;
+       __extension__ enum SUIDRoot need_suid:4;
 };
 
 /* From busybox.c */
@@ -118,4 +93,8 @@ extern const struct BB_applet applets[];
 #define  PATH_MAX         256
 #endif
 
+#ifdef DMALLOC
+#include <dmalloc.h>
+#endif
+
 #endif                                                 /* _BB_INTERNAL_H_ */