aboutsummaryrefslogtreecommitdiff
path: root/networking/udhcp/libbb_udhcp.h
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-03-23 03:05:05 +0000
committerMike Frysinger <vapier@gentoo.org>2006-03-23 03:05:05 +0000
commit13c8327b796862847f3682da2902381c39cf24ea (patch)
treed552ee35bb892efff30a62fc8d5ce924b1bf8703 /networking/udhcp/libbb_udhcp.h
parente1d41b3102a34d92e61b265810306bb437c73ba0 (diff)
downloadbusybox-w32-13c8327b796862847f3682da2902381c39cf24ea.tar.gz
busybox-w32-13c8327b796862847f3682da2902381c39cf24ea.tar.bz2
busybox-w32-13c8327b796862847f3682da2902381c39cf24ea.zip
sync busybox and udhcp trees
Diffstat (limited to 'networking/udhcp/libbb_udhcp.h')
-rw-r--r--networking/udhcp/libbb_udhcp.h23
1 files changed, 16 insertions, 7 deletions
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 @@
3/* bit of a hack, do this no matter what the order of the includes. 3/* bit of a hack, do this no matter what the order of the includes.
4 * (for busybox) */ 4 * (for busybox) */
5 5
6#ifdef CONFIG_INSTALL_NO_USR
7#undef DEFAULT_SCRIPT
8#define DEFAULT_SCRIPT "/share/udhcpc/default.script"
9#endif
10
11#ifndef _LIBBB_UDHCP_H 6#ifndef _LIBBB_UDHCP_H
12#define _LIBBB_UDHCP_H 7#define _LIBBB_UDHCP_H
13 8
9#ifdef CONFIG_INSTALL_NO_USR
10# define DEFAULT_SCRIPT "/share/udhcpc/default.script"
11#else
12# define DEFAULT_SCRIPT "/usr/share/udhcpc/default.script"
13#endif
14
14#ifdef IN_BUSYBOX 15#ifdef IN_BUSYBOX
15#include "busybox.h" 16#include "busybox.h"
16 17
@@ -56,12 +57,20 @@
56/* from dhcpd.h */ 57/* from dhcpd.h */
57#define server_config udhcp_server_config 58#define server_config udhcp_server_config
58 59
59#else /* ! BB_VER */ 60#else /* ! IN_BUSYBOX */
60 61
61#include <stdlib.h> 62#include <stdlib.h>
62#include <stdio.h> 63#include <stdio.h>
63#include <sys/sysinfo.h> 64#include <sys/sysinfo.h>
64 65
66#ifndef ATTRIBUTE_NORETURN
67#define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
68#endif /* ATTRIBUTE_NORETURN */
69
70#ifndef ATTRIBUTE_PACKED
71#define ATTRIBUTE_PACKED __attribute__ ((__packed__))
72#endif /* ATTRIBUTE_PACKED */
73
65#define TRUE 1 74#define TRUE 1
66#define FALSE 0 75#define FALSE 0
67 76
@@ -78,6 +87,6 @@ static inline FILE *xfopen(const char *file, const char *mode)
78 return fp; 87 return fp;
79} 88}
80 89
81#endif /* BB_VER */ 90#endif /* IN_BUSYBOX */
82 91
83#endif /* _LIBBB_UDHCP_H */ 92#endif /* _LIBBB_UDHCP_H */