Module Name: src Committed By: spz Date: Sat Jul 12 20:03:19 UTC 2014
Modified Files: src/external/bsd/dhcp/include: config.h Log Message: update config.h to the new version and enable DHCPv6 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/dhcp/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/bsd/dhcp/include/config.h diff -u src/external/bsd/dhcp/include/config.h:1.4 src/external/bsd/dhcp/include/config.h:1.5 --- src/external/bsd/dhcp/include/config.h:1.4 Wed Mar 27 00:38:54 2013 +++ src/external/bsd/dhcp/include/config.h Sat Jul 12 20:03:19 2014 @@ -1,6 +1,9 @@ /* includes/config.h. Generated from config.h.in by configure. */ /* includes/config.h.in. Generated from configure.ac by autoheader. */ +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + /* Define to compile debug-only DHCP software. */ /* #undef DEBUG */ @@ -12,11 +15,8 @@ #include <sys/endian.h> #define DHCP_BYTE_ORDER _BYTE_ORDER -#if 0 -/* From the Makefile */ /* Define to 1 to include DHCPv6 support. */ #define DHCPv6 1 -#endif /* Define to any value to chroot() prior to loading config. */ /* #undef EARLY_CHROOT */ @@ -34,7 +34,7 @@ (struct s)' as it overestimates the size. Use 'offsetof (struct s, d)' instead. Don't use 'offsetof (struct s, d[0])', as this doesn't work with MSVC and with C++ compilers. */ -#define FLEXIBLE_ARRAY_MEMBER +#define FLEXIBLE_ARRAY_MEMBER /**/ /* Define to 1 to use the Berkeley Packet Filter interface code. */ #define HAVE_BPF 1 @@ -70,7 +70,7 @@ #define HAVE_REGEX_H 1 /* Define to 1 if the sockaddr structure has a length field. */ -#define HAVE_SA_LEN +#define HAVE_SA_LEN /**/ /* Define to 1 if you have the <stdint.h> header file. */ #define HAVE_STDINT_H 1 @@ -84,6 +84,9 @@ /* Define to 1 if you have the <string.h> header file. */ #define HAVE_STRING_H 1 +/* Define to 1 if you have the `strlcat' function. */ +#define HAVE_STRLCAT 1 + /* Define to 1 if you have the <sys/socket.h> header file. */ #define HAVE_SYS_SOCKET_H 1 @@ -121,13 +124,16 @@ #define PACKAGE_NAME "DHCP" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "DHCP 4.2.5-P1" +#define PACKAGE_STRING "DHCP 4.3.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "dhcp" +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + /* Define to the version of this package. */ -#define PACKAGE_VERSION "4.2.5-P1" +#define PACKAGE_VERSION "4.3.0" /* Define to any value to include Ari's PARANOIA patch. */ /* #undef PARANOIA */ @@ -147,23 +153,45 @@ /* Define to 1 to use the standard BSD socket API. */ /* #undef USE_SOCKETS */ -/* Define to 1 to enable IPv4 packet info support. */ -/* #undef USE_V4_PKTINFO */ - -/* Version number of package */ -#define VERSION "4.2.5-P1" - -/* Define to 1 if on AIX 3. - System headers sometimes define this. - We just want to avoid a redefinition error message. */ +/* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE /* # undef _ALL_SOURCE */ #endif - /* Enable GNU extensions on systems that have them. */ #ifndef _GNU_SOURCE # define _GNU_SOURCE 1 #endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif + + +/* Define to 1 to enable IPv4 packet info support. */ +/* #undef USE_V4_PKTINFO */ + +/* Version number of package */ +#define VERSION "4.3.0" + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +/* # undef WORDS_BIGENDIAN */ +# endif +#endif /* Define to 1 if on MINIX. */ /* #undef _MINIX */ @@ -206,31 +234,20 @@ /* #undef _POSIX_SOURCE */ /* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>, - <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the + <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the #define below would cause a syntax error. */ /* #undef _UINT32_T */ /* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>, - <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the + <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the #define below would cause a syntax error. */ /* #undef _UINT64_T */ /* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>, - <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the + <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the #define below would cause a syntax error. */ /* #undef _UINT8_T */ -/* Enable extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# define __EXTENSIONS__ 1 -#endif -#ifndef _POSIX_PTHREAD_SEMANTICS -# define _POSIX_PTHREAD_SEMANTICS 1 -#endif -#ifndef _TANDEM_SOURCE -# define _TANDEM_SOURCE 1 -#endif - /* Define to the type of a signed integer type of width exactly 16 bits if such a type exists and the standard includes do not define it. */ /* #undef int16_t */