lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-05 20:55:46 +03:00
Code Activity

BUG 97: Fix strtoull() detection on serveral platforms.

Browse Source
This commit is contained in:
Andreas Schneider
2012-12-03 14:00:06 +01:00
parent 3896aa43ff
commit b14df297fa
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ConfigureChecks.cmake
View File

@@ -139,6 +139,8 @@ if (UNIX)
check_function_exists(cfmakeraw HAVE_CFMAKERAW) check_function_exists(cfmakeraw HAVE_CFMAKERAW)
check_function_exists(ntohll HAVE_NTOHLL) check_function_exists(ntohll HAVE_NTOHLL)
check_function_exists(htonll HAVE_HTONLL) check_function_exists(htonll HAVE_HTONLL)
check_function_exists(strtoull HAVE_STRTOULL)
check_function_exists(__strtoull HAVE___STRTOULL)
endif (UNIX) endif (UNIX)
set(LIBSSH_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} CACHE INTERNAL "libssh required system libraries") set(LIBSSH_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} CACHE INTERNAL "libssh required system libraries")

6
config.h.cmake
View File

@@ -100,6 +100,12 @@
/* Define to 1 if you have the `htonll' function. */ /* Define to 1 if you have the `htonll' function. */
#cmakedefine HAVE_HTONLL 1 #cmakedefine HAVE_HTONLL 1
/* Define to 1 if you have the `strtoull' function. */
#cmakedefine HAVE_STRTOULL 1
/* Define to 1 if you have the `__strtoull' function. */
#cmakedefine HAVE___STRTOULL 1
/*************************** LIBRARIES ***************************/ /*************************** LIBRARIES ***************************/
/* Define to 1 if you have the `crypto' library (-lcrypto). */ /* Define to 1 if you have the `crypto' library (-lcrypto). */

14
include/libssh/priv.h
View File

@@ -47,6 +47,16 @@
# endif /* __WORDSIZE */ # endif /* __WORDSIZE */
# endif /* PRIu64 */ # endif /* PRIu64 */
#if !defined(HAVE_STRTOULL)
# if defined(HAVE___STRTOULL)
# define strtoull __strtoull
# elif defined(__hpux) && defined(__LP64__)
# define strtoull strtoul
# else
# error "no strtoull function found"
# endif
#endif /* !defined(HAVE_STRTOULL) */
# ifdef _MSC_VER # ifdef _MSC_VER
# include <stdio.h> # include <stdio.h>
@@ -56,7 +66,9 @@
# define strcasecmp _stricmp # define strcasecmp _stricmp
# define strncasecmp _strnicmp # define strncasecmp _strnicmp
# define strtoull _strtoui64 # if !defined(HAVE_STRTOULL)
# define strtoull _strtoui64
# endif
# define isblank(ch) ((ch) == ' ' || (ch) == '\t' || (ch) == '\n' || (ch) == '\r') # define isblank(ch) ((ch) == ' ' || (ch) == '\t' || (ch) == '\n' || (ch) == '\r')
# define usleep(X) Sleep(((X)+1000)/1000) # define usleep(X) Sleep(((X)+1000)/1000)