[BusyBox] libc5: logread.c dutmp.c

Giulio Orsero giulioo at pobox.com
Thu Mar 15 18:21:06 UTC 2001


--- logread.c.orig      Thu Mar 15 19:10:07 2001
+++ logread.c   Thu Mar 15 19:10:21 2001
@@ -26,7 +26,7 @@
 
 /* Stupid libc doesn't have a reliable way for use to know
  * that libc5 is being used.   Assume this is good enough */
-#if ! defined __GLIBC__ || ! defined __UCLIBC__
+#if ! defined __GLIBC__ && ! defined __UCLIBC__
 #error Sorry.  Looks like you are using libc5.
 #error libc5 shm support isnt good enough.
 #error Please disable BB_FEATURE_IPC_SYSLOG


Not sure if the missing ! is intentional:
--- dutmp.c.orig        Thu Mar 15 19:12:08 2001
+++ dutmp.c     Thu Mar 15 19:12:30 2001
@@ -45,7 +45,7 @@
  * fact the stupid libc doesn't have a reliable #define to announce that libc5
  * is being used.  sigh.
  */
-#if ! defined __GLIBC__ || defined __UCLIBC__
+#if ! defined __GLIBC__ && ! defined __UCLIBC__
        while (read(file, (void*)&ut, sizeof(struct utmp))) {
                printf("%d|%d|%s|%s|%s|%s|%s|%lx\n",
                                ut.ut_type, ut.ut_pid, ut.ut_line,

-- 
giulioo at pobox.com





More information about the busybox mailing list