osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Don't check for the existence of gzclearerr() any more. 

Check for inflatePrime().

svn path=/trunk/; revision=36955
This commit is contained in:
Jeff Morriss 2011-04-29 18:29:26 +00:00
parent 6ff4737f44
commit b9b68170f0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/modules/FindZLIB.cmake
View File

@ -37,11 +37,11 @@ SET(ZLIB_LIBRARIES "${ZLIB_LIBRARY}")
INCLUDE(CheckFunctionExists)
SET(CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES})
CHECK_FUNCTION_EXISTS("gzclearerr" HAVE_GZCLEARERR)
CHECK_FUNCTION_EXISTS("inflatePrime" HAVE_INFLATEPRIME)
# reset
SET(CMAKE_REQUIRED_LIBRARIES "")
# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if
# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_LIBRARIES ZLIB_INCLUDE_DIRS)

6
cmakeconfig.h.in
View File

@ -111,8 +111,8 @@
/* Define to use libz library */
#cmakedefine HAVE_LIBZ 1
/* Define to 1 if you have the `gzclearerr' function */
#cmakedefine HAVE_GZCLEARERR 1
/* Define to 1 if you have the `inflatePrime' function */
#cmakedefine HAVE_INFLATEPRIME 1
/* Define to 1 if you have the <lua5.1/lauxlib.h> header file. */
#cmakedefine HAVE_LUA5_1_LAUXLIB_H 1
@ -353,7 +353,7 @@
/* Define WS_MSVC_NORETURN appropriately for declarations of routines that
never return (just like Charlie on the MTA).
Note that MSVC++ expects __declspec(noreturn) to precede the function
name and GCC, as far as I know, expects __attribute__((noreturn)) to
follow the function name, so we need two different flavors of