summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2013-05-22 10:40:58 +0000
committerAlbrecht Schlosser <albrechts.fltk@online.de>2013-05-22 10:40:58 +0000
commite9767cce34a31eb3ad785936bba5b2971af1f79c (patch)
tree66dcb49a3590bc29a83b5af3ca9e1507b8a13799
parent502280c09712eb22245ee2ad0bc3bec43457f59b (diff)
Removed autoconf/configure and CMake tests and defines for
unused function strtoll() [resolves one part of STR #2965]. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9923 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--CHANGES2
-rw-r--r--CMakeLists.txt1
-rw-r--r--configh.cmake.in10
-rw-r--r--configh.in10
-rw-r--r--configure.in2
5 files changed, 2 insertions, 23 deletions
diff --git a/CHANGES b/CHANGES
index a89bd82d3..e6b1de5c3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
CHANGES IN FLTK 1.3.3
+ - Removed autoconf/configure and CMake tests and defines for
+ unused function strtoll().
- Fixed access of protected member (STR #2903)
- Implemented support for the Mac OS text input system that deals with character composition
and input of languages with large character sets (e.g., Chinese and Japanese). This
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb7ec8692..8693bb736 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -179,7 +179,6 @@ CHECK_FUNCTION_EXISTS(strcasecmp HAVE_STRCASECMP)
CHECK_FUNCTION_EXISTS(strlcat HAVE_STRLCAT)
CHECK_FUNCTION_EXISTS(strlcpy HAVE_STRLCPY)
-CHECK_FUNCTION_EXISTS(strtoll HAVE_STRTOLL)
CHECK_FUNCTION_EXISTS(vsnprintf HAVE_VSNPRINTF)
set(CMAKE_REQUIRED_LIBRARIES)
diff --git a/configh.cmake.in b/configh.cmake.in
index 1afef5a31..b2f10ece0 100644
--- a/configh.cmake.in
+++ b/configh.cmake.in
@@ -293,16 +293,6 @@
#endif /* HAVE_LONG_LONG */
/*
- * Do we have the strtoll() function?
- */
-
-#cmakedefine HAVE_STRTOLL @HAVE_STRTOLL@
-
-#ifndef HAVE_STRTOLL
-# define strtoll(nptr,endptr,base) strtol((nptr), (endptr), (base))
-#endif /* !HAVE_STRTOLL */
-
-/*
* Do we have the dlsym() function and header?
*/
diff --git a/configh.in b/configh.in
index 4a806e475..028313c70 100644
--- a/configh.in
+++ b/configh.in
@@ -298,16 +298,6 @@
#endif /* HAVE_LONG_LONG */
/*
- * Do we have the strtoll() function?
- */
-
-#undef HAVE_STRTOLL
-
-#ifndef HAVE_STRTOLL
-# define strtoll(nptr,endptr,base) strtol((nptr), (endptr), (base))
-#endif /* !HAVE_STRTOLL */
-
-/*
* Do we have the dlsym() function and header?
*/
diff --git a/configure.in b/configure.in
index e27c42da1..b1cee59e2 100644
--- a/configure.in
+++ b/configure.in
@@ -587,8 +587,6 @@ if test $ac_cv_c_long_long = yes; then
AC_DEFINE(HAVE_LONG_LONG)
fi
-AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL))
-
dnl Check for dlopen/dlsym...
AC_SEARCH_LIBS(dlsym, dl, AC_DEFINE(HAVE_DLSYM))
AC_CHECK_HEADER(dlfcn.h, AC_DEFINE(HAVE_DLFCN_H))