diff options
| author | Russ Dill <Russ.Dill@asu.edu> | 2003-12-18 22:25:38 +0000 |
|---|---|---|
| committer | Russ Dill <Russ.Dill@asu.edu> | 2003-12-18 22:25:38 +0000 |
| commit | 4e864a36b611f56c6b347be1dace4e5e805a3eb8 (patch) | |
| tree | 6582084290de4bead010f5fb8ff0a0a6d2b573fd /networking/udhcp/libbb_udhcp.h | |
| parent | e30495654d8bb38f7ea234d9d0ab0929525501e3 (diff) | |
| download | busybox-4e864a36b611f56c6b347be1dace4e5e805a3eb8.tar.gz | |
Finish remerging busybox udhcp and udhcp. Some cleanups as well.
Diffstat (limited to 'networking/udhcp/libbb_udhcp.h')
| -rw-r--r-- | networking/udhcp/libbb_udhcp.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/networking/udhcp/libbb_udhcp.h b/networking/udhcp/libbb_udhcp.h index 73e21464f..9b5d5a846 100644 --- a/networking/udhcp/libbb_udhcp.h +++ b/networking/udhcp/libbb_udhcp.h @@ -1,5 +1,13 @@ /* libbb_udhcp.h - busybox compatability wrapper */ +/* bit of a hack, do this no matter what the order of the includes. + * (for busybox) */ + +#ifdef CONFIG_INSTALL_NO_USR +#undef DEFUALT_SCRIPT +#define DEFAULT_SCRIPT "/share/udhcpc/default.script" +#endif + #ifndef _LIBBB_UDHCP_H #define _LIBBB_UDHCP_H @@ -7,22 +15,16 @@ #include "busybox.h" #ifdef CONFIG_FEATURE_UDHCP_SYSLOG -#define SYSLOG +#define UDHCP_SYSLOG #endif #ifdef CONFIG_FEATURE_UDHCP_DEBUG -#define DEBUG +#define UDHCP_DEBUG #endif #define COMBINED_BINARY #include "version.h" -#ifdef CONFIG_INSTALL_NO_USR -#define DEFAULT_SCRIPT "/share/udhcpc/default.script" -#else -#define DEFAULT_SCRIPT "/usr/share/udhcpc/default.script" -#endif - #define xfopen bb_xfopen #else /* ! BB_VER */ @@ -36,8 +38,6 @@ #define xmalloc malloc #define xcalloc calloc -#define DEFAULT_SCRIPT "/usr/share/udhcpc/default.script" - static inline FILE *xfopen(const char *file, const char *mode) { FILE *fp; |