diff options
author | Vladislav Vaintroub <wlad@sun.com> | 2010-07-25 19:30:18 +0200 |
---|---|---|
committer | Vladislav Vaintroub <wlad@sun.com> | 2010-07-25 19:30:18 +0200 |
commit | 5defb074edcdc43f24e16247c394e292eb452ca4 (patch) | |
tree | ce3ef507ab2616316faa7301c2b622609ac6c846 /config.h.cmake | |
parent | d6b93c7397fc2746ad4e183300504f4bee79936a (diff) | |
download | mariadb-git-5defb074edcdc43f24e16247c394e292eb452ca4.tar.gz |
Cleanup after bild team push.
* Fixed obvious errors (HAVE_BROKEN_PREAD is not true for on any
of systems we use, definitely not on HPUX)
* Remove other junk flags for OSX and HPUX
* Avoid checking type sizes in universal builds on OSX, again
(CMake2.8.0 fails is different architectures return different results)
* Do not compile template instantiation stuff unless
EXPLICIT_TEMPLATE_INSTANTIATION is used.
* Some cleanup (make gen_lex_hash simpler, avoid dependencies)
* Exclude some unused files from compilation (strtol.c etc)
Diffstat (limited to 'config.h.cmake')
-rw-r--r-- | config.h.cmake | 37 |
1 files changed, 5 insertions, 32 deletions
diff --git a/config.h.cmake b/config.h.cmake index 0800e191aa9..1b59c580503 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -103,7 +103,6 @@ #cmakedefine HAVE_SYS_UTIME_H 1 #cmakedefine HAVE_SYS_WAIT_H 1 #cmakedefine HAVE_SYS_PARAM_H 1 -#cmakedefine HAVE_XFS_XFS_H 1 /* Libraries */ #cmakedefine HAVE_LIBPTHREAD 1 @@ -252,15 +251,6 @@ #cmakedefine HAVE_SIGWAIT 1 #cmakedefine HAVE_SLEEP 1 #cmakedefine HAVE_SNPRINTF 1 -/* Some that currently are not real defines, internal to CMake setup */ -/* #cmakedefine HAVE_FCNTL_NONBLOCK 1 */ -/* #cmakedefine HAVE_FINITE_IN_MATH_H 1 */ -/* #cmakedefine HAVE_SOCKADDR_STORAGE_SS_FAMILY 1 */ -/* #cmakedefine HAVE_SOCKADDR_STORAGE___SS_FAMILY 1 */ -/* #cmakedefine HAVE_SOCKET_SIZE_T_AS_int 1 */ -/* #cmakedefine HAVE_SOCKET_SIZE_T_AS_size_t 1 */ -/* #cmakedefine HAVE_SOCKET_SIZE_T_AS_socklen_t */ -/* #cmakedefine HAVE_SOCKET_TIMEOUT */ #cmakedefine HAVE_STPCPY 1 #cmakedefine HAVE_STRERROR 1 #cmakedefine HAVE_STRCOLL 1 @@ -343,13 +333,13 @@ #endif #cmakedefine SIZEOF_CHAR @SIZEOF_CHAR@ -#cmakedefine HAVE_CHAR 1 -#cmakedefine HAVE_LONG 1 -#cmakedefine HAVE_CHARP 1 +#define HAVE_CHAR 1 +#define HAVE_LONG 1 +#define HAVE_CHARP 1 #cmakedefine SIZEOF_SHORT @SIZEOF_SHORT@ -#cmakedefine HAVE_SHORT 1 +#define HAVE_SHORT 1 #cmakedefine SIZEOF_INT @SIZEOF_INT@ -#cmakedefine HAVE_INT 1 +#define HAVE_INT 1 #cmakedefine SIZEOF_LONG_LONG @SIZEOF_LONG_LONG@ #cmakedefine HAVE_LONG_LONG 1 #cmakedefine SIZEOF_OFF_T @SIZEOF_OFF_T@ @@ -581,23 +571,6 @@ #cmakedefine HAVE_UCA_COLLATIONS 1 #cmakedefine HAVE_COMPRESS 1 -/* - Hard coded platform settings -*/ - -/* This is ugly, but we need lots of tweaks for HP-UX */ -#cmakedefine HPUX11 1 -#cmakedefine DO_NOT_REMOVE_THREAD_WRAPPERS 1 -#cmakedefine HAVE_BROKEN_PREAD 1 -#cmakedefine HAVE_BROKEN_PTHREAD_COND_TIMEDWAIT 1 -#cmakedefine SNPRINTF_RETURN_TRUNC 1 -#cmakedefine _INCLUDE_LONGLONG 1 - -/* Mac OS X */ -#cmakedefine SIGNALS_DONT_BREAK_READ 1 -#cmakedefine IGNORE_SIGHUP_SIGQUIT 1 -#cmakedefine _P1003_1B_VISIBLE 1 -#cmakedefine DONT_DECLARE_CXA_PURE_VIRTUAL 1 /* Stuff that always need to be defined (compile breaks without it) |