diff options
| author | Mike Frysinger | 2006-03-23 03:05:05 +0000 |
|---|---|---|
| committer | Mike Frysinger | 2006-03-23 03:05:05 +0000 |
| commit | 13c8327b796862847f3682da2902381c39cf24ea (patch) | |
| tree | d552ee35bb892efff30a62fc8d5ce924b1bf8703 /networking/udhcp/libbb_udhcp.h | |
| parent | e1d41b3102a34d92e61b265810306bb437c73ba0 (diff) | |
| download | busybox-13c8327b796862847f3682da2902381c39cf24ea.zip busybox-13c8327b796862847f3682da2902381c39cf24ea.tar.gz | |
sync busybox and udhcp trees
Diffstat (limited to 'networking/udhcp/libbb_udhcp.h')
| -rw-r--r-- | networking/udhcp/libbb_udhcp.h | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/networking/udhcp/libbb_udhcp.h b/networking/udhcp/libbb_udhcp.h index 30e167f..dd58f1b 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 <stdlib.h> #include <stdio.h> #include <sys/sysinfo.h> +#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 */ |