My first bout of untangling udhcp. Make lots of gratuitous #defines go

away, substitutie BB_VER for an external VERSION, use busybox CONFIG symbols
rather than checking for them then defining others, etc.  Lots more cleanup
to do...

1 files changed, 2 insertions, 21 deletions

diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index 071a5c428..77e689446 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -3,29 +3,15 @@
  * Russ Dill <Russ.Dill@asu.edu> September 2001
  * Rewritten by Vladimir Oleynik <dzo@simtreas.ru> (C) 2003
  *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #ifndef _COMMON_H
 #define _COMMON_H
 
-#include "version.h"
 #include "libbb_udhcp.h"
 
 
-#ifndef UDHCP_SYSLOG
 enum syslog_levels {
         LOG_EMERG = 0,
         LOG_ALERT,
@@ -35,18 +21,13 @@ enum syslog_levels {
         LOG_INFO,
         LOG_DEBUG
 };
-#else
 #include <syslog.h>
-#endif
 
 long uptime(void);
-void background(const char *pidfile);
-void start_log_and_pid(const char *client_server, const char *pidfile);
-void udhcp_logging(int level, const char *fmt, ...);
 
 #define LOG(level, str, args...) udhcp_logging(level, str, ## args)
 
-#ifdef UDHCP_DEBUG
+#if ENABLE_FEATURE_UDHCP_DEBUG
 # define DEBUG(level, str, args...) LOG(level, str, ## args)
 #else
 # define DEBUG(level, str, args...) do {;} while(0)