diff options
| author | Eric Andersen <andersen@codepoet.org> | 2001-03-15 18:20:23 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2001-03-15 18:20:23 +0000 |
| commit | a8035a51be6ddaf636847cfb1524b1beed0e8d18 (patch) | |
| tree | 75794f0a910c381ba54b2db53f802ad6637c47e7 | |
| parent | 7384d7dce0f2a8a0541b0a6c9ce2b8a0d6e30b42 (diff) | |
| download | busybox-w32-a8035a51be6ddaf636847cfb1524b1beed0e8d18.tar.gz busybox-w32-a8035a51be6ddaf636847cfb1524b1beed0e8d18.tar.bz2 busybox-w32-a8035a51be6ddaf636847cfb1524b1beed0e8d18.zip | |
Move the warning msg after features.h gets pulled in.
-Erik
| -rw-r--r-- | logread.c | 17 | ||||
| -rw-r--r-- | sysklogd/logread.c | 17 |
2 files changed, 18 insertions, 16 deletions
| @@ -24,14 +24,6 @@ | |||
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | /* Stupid libc doesn't have a reliable way for use to know | ||
| 28 | * that libc5 is being used. Assume this is good enough */ | ||
| 29 | #if ! defined __GLIBC__ || ! defined __UCLIBC__ | ||
| 30 | #error Sorry. Looks like you are using libc5. | ||
| 31 | #error libc5 shm support isnt good enough. | ||
| 32 | #error Please disable BB_FEATURE_IPC_SYSLOG | ||
| 33 | #endif | ||
| 34 | |||
| 35 | #include <stdio.h> | 27 | #include <stdio.h> |
| 36 | #include <stdlib.h> | 28 | #include <stdlib.h> |
| 37 | #include <string.h> | 29 | #include <string.h> |
| @@ -43,6 +35,15 @@ | |||
| 43 | #include <setjmp.h> | 35 | #include <setjmp.h> |
| 44 | #include "busybox.h" | 36 | #include "busybox.h" |
| 45 | 37 | ||
| 38 | /* Stupid libc doesn't have a reliable way for use to know | ||
| 39 | * that libc5 is being used. Assume this is good enough */ | ||
| 40 | #if ! defined __GLIBC__ && ! defined __UCLIBC__ | ||
| 41 | #error Sorry. Looks like you are using libc5. | ||
| 42 | #error libc5 shm support isnt good enough. | ||
| 43 | #error Please disable BB_FEATURE_IPC_SYSLOG | ||
| 44 | #endif | ||
| 45 | |||
| 46 | |||
| 46 | static const long KEY_ID = 0x414e4547; /*"GENA"*/ | 47 | static const long KEY_ID = 0x414e4547; /*"GENA"*/ |
| 47 | 48 | ||
| 48 | static struct shbuf_ds { | 49 | static struct shbuf_ds { |
diff --git a/sysklogd/logread.c b/sysklogd/logread.c index a89daccbb..17f6a54d6 100644 --- a/sysklogd/logread.c +++ b/sysklogd/logread.c | |||
| @@ -24,14 +24,6 @@ | |||
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | /* Stupid libc doesn't have a reliable way for use to know | ||
| 28 | * that libc5 is being used. Assume this is good enough */ | ||
| 29 | #if ! defined __GLIBC__ || ! defined __UCLIBC__ | ||
| 30 | #error Sorry. Looks like you are using libc5. | ||
| 31 | #error libc5 shm support isnt good enough. | ||
| 32 | #error Please disable BB_FEATURE_IPC_SYSLOG | ||
| 33 | #endif | ||
| 34 | |||
| 35 | #include <stdio.h> | 27 | #include <stdio.h> |
| 36 | #include <stdlib.h> | 28 | #include <stdlib.h> |
| 37 | #include <string.h> | 29 | #include <string.h> |
| @@ -43,6 +35,15 @@ | |||
| 43 | #include <setjmp.h> | 35 | #include <setjmp.h> |
| 44 | #include "busybox.h" | 36 | #include "busybox.h" |
| 45 | 37 | ||
| 38 | /* Stupid libc doesn't have a reliable way for use to know | ||
| 39 | * that libc5 is being used. Assume this is good enough */ | ||
| 40 | #if ! defined __GLIBC__ && ! defined __UCLIBC__ | ||
| 41 | #error Sorry. Looks like you are using libc5. | ||
| 42 | #error libc5 shm support isnt good enough. | ||
| 43 | #error Please disable BB_FEATURE_IPC_SYSLOG | ||
| 44 | #endif | ||
| 45 | |||
| 46 | |||
| 46 | static const long KEY_ID = 0x414e4547; /*"GENA"*/ | 47 | static const long KEY_ID = 0x414e4547; /*"GENA"*/ |
| 47 | 48 | ||
| 48 | static struct shbuf_ds { | 49 | static struct shbuf_ds { |