From cefab311d63b3c781e2df0b423002cf62bc7aa3d Mon Sep 17 00:00:00 2001 From: =?utf8?q?=3D=3FUTF-8=3Fq=3FJoakim=3D20S=3DC3=3DB6derberg=3F=3D?= Date: Wed, 24 Jun 2015 16:46:02 +0200 Subject: [PATCH] Use LWS_HAVE_ instead of just HAVE_ Since we include lws_config.h in the public headers, at least our HAVE_ macros should be kind of unique, so that we don't get redefinitions when used with other libraries using config files as well. --- CMakeLists.txt | 80 ++++++++++++++++++++++----------------------- lib/context.c | 2 +- lib/getifaddrs.c | 12 +++---- lib/getifaddrs.h | 2 +- lib/private-libwebsockets.h | 12 +++---- lib/sha-1.c | 2 +- lws_config.h.in | 60 +++++++++++++++++----------------- 7 files changed, 85 insertions(+), 85 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ffb827..9471b3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -224,13 +224,13 @@ foreach(KEYWORD "inline" "__inline__" "__inline") #include static KEYWORD void a() {} int main(int argc, char **argv) { a(); return 0; } - " HAVE_${KEYWORD}) + " LWS_HAVE_${KEYWORD}) endforeach() -if (NOT HAVE_inline) - if (HAVE___inline__) +if (NOT LWS_HAVE_inline) + if (LWS_HAVE___inline__) set(inline __inline__) - elseif(HAVE___inline) + elseif(LWS_HAVE___inline) set(inline __inline) endif() endif() @@ -251,45 +251,45 @@ include(CheckIncludeFiles) include(CheckLibraryExists) include(CheckTypeSize) -CHECK_FUNCTION_EXISTS(bzero HAVE_BZERO) -CHECK_FUNCTION_EXISTS(fork HAVE_FORK) -CHECK_FUNCTION_EXISTS(getenv HAVE_GETENV) -CHECK_FUNCTION_EXISTS(malloc HAVE_MALLOC) -CHECK_FUNCTION_EXISTS(memset HAVE_MEMSET) -CHECK_FUNCTION_EXISTS(realloc HAVE_REALLOC) -CHECK_FUNCTION_EXISTS(socket HAVE_SOCKET) -CHECK_FUNCTION_EXISTS(strerror HAVE_STRERROR) -CHECK_FUNCTION_EXISTS(vfork HAVE_VFORK) -CHECK_FUNCTION_EXISTS(getifaddrs HAVE_GETIFADDRS) - -if (NOT HAVE_GETIFADDRS) +CHECK_FUNCTION_EXISTS(bzero LWS_HAVE_BZERO) +CHECK_FUNCTION_EXISTS(fork LWS_HAVE_FORK) +CHECK_FUNCTION_EXISTS(getenv LWS_HAVE_GETENV) +CHECK_FUNCTION_EXISTS(malloc LWS_HAVE_MALLOC) +CHECK_FUNCTION_EXISTS(memset LWS_HAVE_MEMSET) +CHECK_FUNCTION_EXISTS(realloc LWS_HAVE_REALLOC) +CHECK_FUNCTION_EXISTS(socket LWS_HAVE_SOCKET) +CHECK_FUNCTION_EXISTS(strerror LWS_HAVE_STRERROR) +CHECK_FUNCTION_EXISTS(vfork LWS_HAVE_VFORK) +CHECK_FUNCTION_EXISTS(getifaddrs LWS_HAVE_GETIFADDRS) + +if (NOT LWS_HAVE_GETIFADDRS) if (LWS_WITHOUT_BUILTIN_GETIFADDRS) message(FATAL_ERROR "No getifaddrs was found on the system. Turn off the LWS_WITHOUT_BUILTIN_GETIFADDRS compile option to use the supplied BSD version.") endif() set(LWS_BUILTIN_GETIFADDRS 1) endif() -CHECK_INCLUDE_FILE(dlfcn.h HAVE_DLFCN_H) -CHECK_INCLUDE_FILE(fcntl.h HAVE_FCNTL_H) -CHECK_INCLUDE_FILE(in6addr.h HAVE_IN6ADDR_H) -CHECK_INCLUDE_FILE(inttypes.h HAVE_INTTYPES_H) -CHECK_INCLUDE_FILE(memory.h HAVE_MEMORY_H) -CHECK_INCLUDE_FILE(netinet/in.h HAVE_NETINET_IN_H) -CHECK_INCLUDE_FILE(stdint.h HAVE_STDINT_H) -CHECK_INCLUDE_FILE(stdlib.h HAVE_STDLIB_H) -CHECK_INCLUDE_FILE(strings.h HAVE_STRINGS_H) -CHECK_INCLUDE_FILE(string.h HAVE_STRING_H) -CHECK_INCLUDE_FILE(sys/prctl.h HAVE_SYS_PRCTL_H) -CHECK_INCLUDE_FILE(sys/socket.h HAVE_SYS_SOCKET_H) -CHECK_INCLUDE_FILE(sys/stat.h HAVE_SYS_STAT_H) -CHECK_INCLUDE_FILE(sys/types.h HAVE_SYS_TYPES_H) -CHECK_INCLUDE_FILE(unistd.h HAVE_UNISTD_H) -CHECK_INCLUDE_FILE(vfork.h HAVE_VFORK_H) -CHECK_INCLUDE_FILE(zlib.h HAVE_ZLIB_H) +CHECK_INCLUDE_FILE(dlfcn.h LWS_HAVE_DLFCN_H) +CHECK_INCLUDE_FILE(fcntl.h LWS_HAVE_FCNTL_H) +CHECK_INCLUDE_FILE(in6addr.h LWS_HAVE_IN6ADDR_H) +CHECK_INCLUDE_FILE(inttypes.h LWS_HAVE_INTTYPES_H) +CHECK_INCLUDE_FILE(memory.h LWS_HAVE_MEMORY_H) +CHECK_INCLUDE_FILE(netinet/in.h LWS_HAVE_NETINET_IN_H) +CHECK_INCLUDE_FILE(stdint.h LWS_HAVE_STDINT_H) +CHECK_INCLUDE_FILE(stdlib.h LWS_HAVE_STDLIB_H) +CHECK_INCLUDE_FILE(strings.h LWS_HAVE_STRINGS_H) +CHECK_INCLUDE_FILE(string.h LWS_HAVE_STRING_H) +CHECK_INCLUDE_FILE(sys/prctl.h LWS_HAVE_SYS_PRCTL_H) +CHECK_INCLUDE_FILE(sys/socket.h LWS_HAVE_SYS_SOCKET_H) +CHECK_INCLUDE_FILE(sys/stat.h LWS_HAVE_SYS_STAT_H) +CHECK_INCLUDE_FILE(sys/types.h LWS_HAVE_SYS_TYPES_H) +CHECK_INCLUDE_FILE(unistd.h LWS_HAVE_UNISTD_H) +CHECK_INCLUDE_FILE(vfork.h LWS_HAVE_VFORK_H) +CHECK_INCLUDE_FILE(zlib.h LWS_HAVE_ZLIB_H) # TODO: These can be tested if they actually work also... -set(HAVE_WORKING_FORK HAVE_FORK) -set(HAVE_WORKING_VFORK HAVE_VFORK) +set(LWS_HAVE_WORKING_FORK LWS_HAVE_FORK) +set(LWS_HAVE_WORKING_VFORK LWS_HAVE_VFORK) CHECK_INCLUDE_FILES("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS) @@ -304,11 +304,11 @@ if (NOT SIZE_T_SIZE) set(size_t "unsigned int") endif() -if (NOT HAVE_MALLOC) +if (NOT LWS_HAVE_MALLOC) set(malloc rpl_malloc) endif() -if (NOT HAVE_REALLOC) +if (NOT LWS_HAVE_REALLOC) set(realloc rpl_realloc) endif() @@ -408,7 +408,7 @@ else() endif() if (UNIX) - if (NOT HAVE_GETIFADDRS) + if (NOT LWS_HAVE_GETIFADDRS) list(APPEND HDR_PRIVATE lib/getifaddrs.h) list(APPEND SOURCES lib/getifaddrs.c) endif() @@ -416,8 +416,8 @@ endif() if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) include (CheckCCompilerFlag) - CHECK_C_COMPILER_FLAG(-fvisibility=hidden HAVE_VISIBILITY) - if (HAVE_VISIBILITY) + CHECK_C_COMPILER_FLAG(-fvisibility=hidden LWS_HAVE_VISIBILITY) + if (LWS_HAVE_VISIBILITY) set(VISIBILITY_FLAG -fvisibility=hidden) endif() if (UNIX) diff --git a/lib/context.c b/lib/context.c index 23f0575..02207dc 100644 --- a/lib/context.c +++ b/lib/context.c @@ -193,7 +193,7 @@ libwebsocket_create_context(struct lws_context_creation_info *info) sizeof(context->http_proxy_address) - 1] = '\0'; context->http_proxy_port = info->http_proxy_port; } else { -#ifdef HAVE_GETENV +#ifdef LWS_HAVE_GETENV p = getenv("http_proxy"); if (p) { strncpy(context->http_proxy_address, p, diff --git a/lib/getifaddrs.c b/lib/getifaddrs.c index c9ed464..ae6e639 100644 --- a/lib/getifaddrs.c +++ b/lib/getifaddrs.c @@ -2,7 +2,7 @@ * downloaded from * http://ftp.uninett.no/pub/OpenBSD/src/kerberosV/src/lib/roken/getifaddrs.c */ -#if !HAVE_GETIFADDRS +#if !LWS_HAVE_GETIFADDRS /* * Copyright (c) 2000 - 2001 Kungliga Tekniska H�gskolan * (Royal Institute of Technology, Stockholm, Sweden). @@ -46,11 +46,11 @@ #include #include "private-libwebsockets.h" -#ifdef HAVE_SYS_SOCKIO_H +#ifdef LWS_HAVE_SYS_SOCKIO_H #include #endif -#ifdef HAVE_NETINET_IN6_VAR_H +#ifdef LWS_HAVE_NETINET_IN6_VAR_H #include #endif @@ -122,7 +122,7 @@ getifaddrs2(struct ifaddrs **ifap, sz = ifreq_sz; salen = sizeof(struct sockaddr); -#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN +#ifdef LWS_HAVE_STRUCT_SOCKADDR_SA_LEN salen = sa->sa_len; sz = max(sz, sizeof(ifr->ifr_name) + sa->sa_len); #endif @@ -192,7 +192,7 @@ getifaddrs(struct ifaddrs **ifap) ret = getifaddrs2(ifap, AF_INET6, SIOCGIF6CONF, SIOCGIF6FLAGS, sizeof(struct in6_ifreq)); #endif -#if defined(HAVE_IPV6) && defined(SIOCGIFCONF) +#if defined(LWS_HAVE_IPV6) && defined(SIOCGIFCONF) if (ret) ret = getifaddrs2(ifap, AF_INET6, SIOCGIFCONF, SIOCGIFFLAGS, sizeof(struct ifreq)); @@ -229,7 +229,7 @@ print_addr(const char *s, struct sockaddr *sa) { int i; printf(" %s=%d/", s, sa->sa_family); -#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN +#ifdef LWS_HAVE_STRUCT_SOCKADDR_SA_LEN for (i = 0; i < sa->sa_len - ((long)sa->sa_data - (long)&sa->sa_family); i++) printf("%02x", ((unsigned char *)sa->sa_data)[i]); diff --git a/lib/getifaddrs.h b/lib/getifaddrs.h index da69b50..4cd0ee5 100644 --- a/lib/getifaddrs.h +++ b/lib/getifaddrs.h @@ -1,4 +1,4 @@ -#if HAVE_GETIFADDRS +#if LWS_HAVE_GETIFADDRS #include #include #else diff --git a/lib/private-libwebsockets.h b/lib/private-libwebsockets.h index a35b9ea..8f6d043 100644 --- a/lib/private-libwebsockets.h +++ b/lib/private-libwebsockets.h @@ -21,7 +21,7 @@ #include "lws_config.h" -#ifdef HAVE_SYS_TYPES_H +#ifdef LWS_HAVE_SYS_TYPES_H #include #endif @@ -33,7 +33,7 @@ #include #include -#ifdef HAVE_SYS_STAT_H +#ifdef LWS_HAVE_SYS_STAT_H #include #endif @@ -67,7 +67,7 @@ #include #include #include -#ifdef HAVE_IN6ADDR_H +#ifdef LWS_HAVE_IN6ADDR_H #include #endif #include @@ -104,7 +104,7 @@ #include #include #ifndef LWS_NO_FORK -#ifdef HAVE_SYS_PRCTL_H +#ifdef LWS_HAVE_SYS_PRCTL_H #include #endif #endif @@ -138,13 +138,13 @@ #define lws_set_blocking_send(wsi) #endif -#ifndef HAVE_BZERO +#ifndef LWS_HAVE_BZERO #ifndef bzero #define bzero(b, len) (memset((b), '\0', (len)), (void) 0) #endif #endif -#ifndef HAVE_STRERROR +#ifndef LWS_HAVE_STRERROR #define strerror(x) "" #endif diff --git a/lib/sha-1.c b/lib/sha-1.c index e68ee38..019f92a 100644 --- a/lib/sha-1.c +++ b/lib/sha-1.c @@ -34,7 +34,7 @@ #include "private-libwebsockets.h" -#ifdef HAVE_SYS_TYPES_H +#ifdef LWS_HAVE_SYS_TYPES_H #include #endif diff --git a/lws_config.h.in b/lws_config.h.in index 65c4d0a..8b49d2f 100644 --- a/lws_config.h.in +++ b/lws_config.h.in @@ -60,93 +60,93 @@ #cmakedefine LWS_BUILTIN_GETIFADDRS /* Define to 1 if you have the `bzero' function. */ -#cmakedefine HAVE_BZERO +#cmakedefine LWS_HAVE_BZERO /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_DLFCN_H +#cmakedefine LWS_HAVE_DLFCN_H /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_FCNTL_H +#cmakedefine LWS_HAVE_FCNTL_H /* Define to 1 if you have the `fork' function. */ -#cmakedefine HAVE_FORK +#cmakedefine LWS_HAVE_FORK /* Define to 1 if you have the `getenv’ function. */ -#cmakedefine HAVE_GETENV +#cmakedefine LWS_HAVE_GETENV /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_IN6ADDR_H +#cmakedefine LWS_HAVE_IN6ADDR_H /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_INTTYPES_H +#cmakedefine LWS_HAVE_INTTYPES_H /* Define to 1 if you have the `ssl' library (-lssl). */ -//#cmakedefine HAVE_LIBSSL +//#cmakedefine LWS_HAVE_LIBSSL /* Define to 1 if your system has a GNU libc compatible `malloc' function, and to 0 otherwise. */ -#cmakedefine HAVE_MALLOC +#cmakedefine LWS_HAVE_MALLOC /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_MEMORY_H +#cmakedefine LWS_HAVE_MEMORY_H /* Define to 1 if you have the `memset' function. */ -#cmakedefine HAVE_MEMSET +#cmakedefine LWS_HAVE_MEMSET /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_NETINET_IN_H +#cmakedefine LWS_HAVE_NETINET_IN_H /* Define to 1 if your system has a GNU libc compatible `realloc' function, and to 0 otherwise. */ -#cmakedefine HAVE_REALLOC +#cmakedefine LWS_HAVE_REALLOC /* Define to 1 if you have the `socket' function. */ -#cmakedefine HAVE_SOCKET +#cmakedefine LWS_HAVE_SOCKET /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STDINT_H +#cmakedefine LWS_HAVE_STDINT_H /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STDLIB_H +#cmakedefine LWS_HAVE_STDLIB_H /* Define to 1 if you have the `strerror' function. */ -#cmakedefine HAVE_STRERROR +#cmakedefine LWS_HAVE_STRERROR /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STRINGS_H +#cmakedefine LWS_HAVE_STRINGS_H /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STRING_H +#cmakedefine LWS_HAVE_STRING_H /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_PRCTL_H +#cmakedefine LWS_HAVE_SYS_PRCTL_H /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_SOCKET_H +#cmakedefine LWS_HAVE_SYS_SOCKET_H /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_STAT_H +#cmakedefine LWS_HAVE_SYS_STAT_H /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_TYPES_H +#cmakedefine LWS_HAVE_SYS_TYPES_H /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_UNISTD_H +#cmakedefine LWS_HAVE_UNISTD_H /* Define to 1 if you have the `vfork' function. */ -#cmakedefine HAVE_VFORK +#cmakedefine LWS_HAVE_VFORK /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_VFORK_H +#cmakedefine LWS_HAVE_VFORK_H /* Define to 1 if `fork' works. */ -#cmakedefine HAVE_WORKING_FORK +#cmakedefine LWS_HAVE_WORKING_FORK /* Define to 1 if `vfork' works. */ -#cmakedefine HAVE_WORKING_VFORK +#cmakedefine LWS_HAVE_WORKING_VFORK /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_ZLIB_H +#cmakedefine LWS_HAVE_ZLIB_H /* Define to the sub-directory in which libtool stores uninstalled libraries. */ @@ -168,7 +168,7 @@ #cmakedefine size_t /* Define to 1 if we have getifaddrs */ -#cmakedefine HAVE_GETIFADDRS +#cmakedefine LWS_HAVE_GETIFADDRS /* Define as `fork' if `vfork' does not work. */ //#cmakedefine vfork -- 2.7.4