X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fbusybox.h;h=59d800e8b5f14c575031d6ad5d800f14e505ce0d;hb=c57ec37959390ff2e43faa5e4dd5281b2923ced3;hp=ba4edcabaf9d7d7e33a602955e23d771376c2e59;hpb=68474f3b36902ecd903a2d26c06a3d18f3f4bdc5;p=oweals%2Fbusybox.git

diff --git a/include/busybox.h b/include/busybox.h
index ba4edcaba..59d800e8b 100644
--- 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
+#if __GNU_LIBRARY__ < 5 && \
+    !defined(__dietlibc__) && \
+    !defined(_NEWLIB_VERSION)
+#error "Sorry, this libc version is not supported :("
 #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 ")"
-#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 */
@@ -81,29 +56,12 @@ extern const struct BB_applet applets[];
  * applet usage strings.  These are all of the form:
  *		extern int foo_main(int argc, char **argv);
  *		extern const char foo_usage[];
- * These are all autogenerated from the set of currently defined applets. 
+ * These are all autogenerated from the set of currently defined applets.
  */
 #define PROTOTYPES
 #include "applets.h"
 #undef PROTOTYPES
 
-#ifdef CONFIG_FEATURE_BUFFERS_GO_ON_STACK
-#define RESERVE_CONFIG_BUFFER(buffer,len)           char buffer[len]
-#define RESERVE_CONFIG_UBUFFER(buffer,len) unsigned char buffer[len]
-#define RELEASE_CONFIG_BUFFER(buffer)      ((void)0)
-#else
-#ifdef CONFIG_FEATURE_BUFFERS_GO_IN_BSS
-#define RESERVE_CONFIG_BUFFER(buffer,len)  static          char buffer[len]
-#define RESERVE_CONFIG_UBUFFER(buffer,len) static unsigned char buffer[len]
-#define RELEASE_CONFIG_BUFFER(buffer)      ((void)0)
-#else
-#define RESERVE_CONFIG_BUFFER(buffer,len)           char *buffer=xmalloc(len)
-#define RESERVE_CONFIG_UBUFFER(buffer,len) unsigned char *buffer=xmalloc(len)
-#define RELEASE_CONFIG_BUFFER(buffer)      free (buffer)
-#endif
-#endif
-
-
 #ifndef RB_POWER_OFF
 /* Stop system and switch power off if possible.  */
 #define RB_POWER_OFF   0x4321fedc
@@ -118,4 +76,8 @@ extern const struct BB_applet applets[];
 #define  PATH_MAX         256
 #endif
 
+#ifdef DMALLOC
+#include <dmalloc.h>
+#endif
+
 #endif							/* _BB_INTERNAL_H_ */