summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2001-07-02 17:32:40 +0000
committerEric Andersen2001-07-02 17:32:40 +0000
commit22ecf049b634ccd507ed0587526599ed1971c308 (patch)
tree262a81a2bf9e268b5ca8db3bbc7695de495315c9
parent2870d964f8c849d00be20927085f45a30e4e8e53 (diff)
downloadbusybox-22ecf049b634ccd507ed0587526599ed1971c308.zip
busybox-22ecf049b634ccd507ed0587526599ed1971c308.tar.gz
Per patch from vodz, change a couple of consts to defines, since
apparently gcc 2.95.4, at least, is too stupid to realize that a "static const int" is in fact a constant.
-rw-r--r--coreutils/tr.c4
-rw-r--r--sysklogd/syslogd.c4
-rw-r--r--syslogd.c4
-rw-r--r--tr.c4
4 files changed, 12 insertions, 4 deletions
diff --git a/coreutils/tr.c b/coreutils/tr.c
index 07922af..a5d0682 100644
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -31,7 +31,9 @@
#include <sys/types.h>
#include "busybox.h"
-static const int ASCII = 0377;
+/* This must be a #define, since when DODEBUG and BUFFERS_GO_IN_BSS are
+ * enabled, we otherwise get a "storage size isn't constant error. */
+#define ASCII 0377
/* some "globals" shared across this file */
static char com_fl, del_fl, sq_fl;
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 8d8bd1a..89f5348 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -387,7 +387,9 @@ static void domark(int sig)
}
}
-static const int BUFSIZE = 1023;
+/* This must be a #define, since when DODEBUG and BUFFERS_GO_IN_BSS are
+ * enabled, we otherwise get a "storage size isn't constant error. */
+#define BUFSIZE 1023
static int serveConnection (int conn)
{
RESERVE_BB_BUFFER(tmpbuf, BUFSIZE + 1);
diff --git a/syslogd.c b/syslogd.c
index 8d8bd1a..89f5348 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -387,7 +387,9 @@ static void domark(int sig)
}
}
-static const int BUFSIZE = 1023;
+/* This must be a #define, since when DODEBUG and BUFFERS_GO_IN_BSS are
+ * enabled, we otherwise get a "storage size isn't constant error. */
+#define BUFSIZE 1023
static int serveConnection (int conn)
{
RESERVE_BB_BUFFER(tmpbuf, BUFSIZE + 1);
diff --git a/tr.c b/tr.c
index 07922af..a5d0682 100644
--- a/tr.c
+++ b/tr.c
@@ -31,7 +31,9 @@
#include <sys/types.h>
#include "busybox.h"
-static const int ASCII = 0377;
+/* This must be a #define, since when DODEBUG and BUFFERS_GO_IN_BSS are
+ * enabled, we otherwise get a "storage size isn't constant error. */
+#define ASCII 0377
/* some "globals" shared across this file */
static char com_fl, del_fl, sq_fl;