Function name cleanup.

[oweals/busybox.git] / syslogd.c

diff --git a/syslogd.c b/syslogd.c
index f4e7f459b537376758096f0aab3cfddb7d0daa5b..aa1218f3f18ae288b8645a97da55ebca127b1ed9 100644 (file)
--- a/syslogd.c
+++ b/syslogd.c
@@ -42,7 +42,7 @@
 #include <sys/param.h>
 #include <linux/unistd.h>
 
-#if __GNU_LIBRARY__ < 5
+#if ! defined __GLIBC__ && ! defined __UCLIBC__
 
 typedef unsigned int socklen_t;
 
@@ -85,7 +85,7 @@ static const char syslogd_usage[] =
        "Options:\n"
        "\t-m NUM\t\tInterval between MARK lines (default=20min, 0=off)\n"
        "\t-n\t\tRun as a foreground process\n"
-#ifdef BB_KLOGD
+#ifdef BB_FEATURE_KLOGD
        "\t-K\t\tDo not start up the klogd process\n"
 #endif
        "\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)\n"
@@ -316,7 +316,7 @@ static void doSyslogd (void)
        }
 }
 
-#ifdef BB_KLOGD
+#ifdef BB_FEATURE_KLOGD
 
 static void klogd_signal(int sig)
 {
@@ -407,7 +407,7 @@ extern int syslogd_main(int argc, char **argv)
        int pid, klogd_pid;
        int doFork = TRUE;
 
-#ifdef BB_KLOGD
+#ifdef BB_FEATURE_KLOGD
        int startKlogd = TRUE;
 #endif
        int stopDoingThat = FALSE;
@@ -427,7 +427,7 @@ extern int syslogd_main(int argc, char **argv)
                        case 'n':
                                doFork = FALSE;
                                break;
-#ifdef BB_KLOGD
+#ifdef BB_FEATURE_KLOGD
                        case 'K':
                                startKlogd = FALSE;
                                break;
@@ -456,7 +456,7 @@ extern int syslogd_main(int argc, char **argv)
 
        umask(0);
 
-#ifdef BB_KLOGD
+#ifdef BB_FEATURE_KLOGD
        /* Start up the klogd process */
        if (startKlogd == TRUE) {
                klogd_pid = fork();