diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | include/services.h | 2 | ||||
| -rw-r--r-- | include/sysconf.h.cmake | 16 | ||||
| -rw-r--r-- | src/tools/anopesmtp.cpp | 17 |
4 files changed, 2 insertions, 36 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a1858c704..cfaa69efe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -258,12 +258,9 @@ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE STREQUAL "RELWITHDEBINF endif() # Check for the existence of the following include files -check_include_file(cstdint HAVE_CSTDINT) check_include_file(strings.h HAVE_STRINGS_H) # Check for the existence of the following functions -check_function_exists(strcasecmp HAVE_STRCASECMP) -check_function_exists(stricmp HAVE_STRICMP) check_function_exists(umask HAVE_UMASK) check_function_exists(epoll_wait HAVE_EPOLL) check_function_exists(poll HAVE_POLL) diff --git a/include/services.h b/include/services.h index fcdf4a8b9..d6d98adcf 100644 --- a/include/services.h +++ b/include/services.h @@ -31,6 +31,8 @@ #endif /* Pull in the various bits of STL */ +#include <cstdint> +#include <cstddef> #include <iostream> #include <fstream> #include <sstream> diff --git a/include/sysconf.h.cmake b/include/sysconf.h.cmake index 25563a029..b63598ae7 100644 --- a/include/sysconf.h.cmake +++ b/include/sysconf.h.cmake @@ -4,10 +4,6 @@ #cmakedefine DEBUG_BUILD #cmakedefine DEFUMASK @DEFUMASK@ -#cmakedefine HAVE_CSTDINT 1 -#cmakedefine HAVE_STDDEF_H 1 -#cmakedefine HAVE_STRCASECMP 1 -#cmakedefine HAVE_STRICMP 1 #cmakedefine HAVE_STRINGS_H 1 #cmakedefine HAVE_UMASK 1 #cmakedefine HAVE_EVENTFD 1 @@ -15,15 +11,6 @@ #cmakedefine HAVE_POLL 1 #cmakedefine GETTEXT_FOUND 1 -#ifdef HAVE_CSTDINT -# include <cstdint> -#else -# include <stdint.h> -#endif -#ifdef HAVE_STDDEF_H -# include <stddef.h> -#endif - #ifdef _WIN32 # define popen _popen # define pclose _pclose @@ -33,9 +20,6 @@ # endif # define MAXPATHLEN MAX_PATH # define bzero(buf, size) memset(buf, 0, size) -# ifdef MSVCPP -# define strcasecmp stricmp -# endif # define sleep(x) Sleep(x * 1000) #endif diff --git a/src/tools/anopesmtp.cpp b/src/tools/anopesmtp.cpp index d86f9c43f..f97af49ad 100644 --- a/src/tools/anopesmtp.cpp +++ b/src/tools/anopesmtp.cpp @@ -12,14 +12,6 @@ * *nix port by Trystan Scott Lee <trystan@nomadirc.net> */ -#include "sysconf.h" - -/* Some Linux boxes (or maybe glibc includes) require this for the - * prototype of strsignal(). */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE -#endif - #include <string> #include <vector> #include <cstdarg> @@ -46,15 +38,6 @@ #include <sys/types.h> -#ifdef _AIX -extern int strcasecmp(const char *, const char *); -extern int strncasecmp(const char *, const char *, size_t); -# if 0 /* These break on some AIX boxes (4.3.1 reported). */ -extern int socket(int, int, int); -extern int connect(int, struct sockaddr *, int); -# endif -#endif /* _AIX */ - /* Some SUN fixs */ #ifdef __sun /* Solaris specific code, types that do not exist in Solaris' |