From 13c8327b796862847f3682da2902381c39cf24ea Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 23 Mar 2006 03:05:05 +0000 Subject: sync busybox and udhcp trees --- networking/udhcp/libbb_udhcp.h | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'networking/udhcp/libbb_udhcp.h') diff --git a/networking/udhcp/libbb_udhcp.h b/networking/udhcp/libbb_udhcp.h index 30e167f64..dd58f1bd6 100644 --- a/networking/udhcp/libbb_udhcp.h +++ b/networking/udhcp/libbb_udhcp.h @@ -3,14 +3,15 @@ /* bit of a hack, do this no matter what the order of the includes. * (for busybox) */ -#ifdef CONFIG_INSTALL_NO_USR -#undef DEFAULT_SCRIPT -#define DEFAULT_SCRIPT "/share/udhcpc/default.script" -#endif - #ifndef _LIBBB_UDHCP_H #define _LIBBB_UDHCP_H +#ifdef CONFIG_INSTALL_NO_USR +# define DEFAULT_SCRIPT "/share/udhcpc/default.script" +#else +# define DEFAULT_SCRIPT "/usr/share/udhcpc/default.script" +#endif + #ifdef IN_BUSYBOX #include "busybox.h" @@ -56,12 +57,20 @@ /* from dhcpd.h */ #define server_config udhcp_server_config -#else /* ! BB_VER */ +#else /* ! IN_BUSYBOX */ #include #include #include +#ifndef ATTRIBUTE_NORETURN +#define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) +#endif /* ATTRIBUTE_NORETURN */ + +#ifndef ATTRIBUTE_PACKED +#define ATTRIBUTE_PACKED __attribute__ ((__packed__)) +#endif /* ATTRIBUTE_PACKED */ + #define TRUE 1 #define FALSE 0 @@ -78,6 +87,6 @@ static inline FILE *xfopen(const char *file, const char *mode) return fp; } -#endif /* BB_VER */ +#endif /* IN_BUSYBOX */ #endif /* _LIBBB_UDHCP_H */ -- cgit v1.2.3