diff options
| author | Kent Boortz <kent.boortz@sun.com> | 2010-05-21 01:40:12 +0200 |
|---|---|---|
| committer | Kent Boortz <kent.boortz@sun.com> | 2010-05-21 01:40:12 +0200 |
| commit | 35eecf3d65db03b210f75fea8b33834cee62c88f (patch) | |
| tree | c0da9110a2bb0cfda797c0fdb6097d766230bb16 /config.h.cmake | |
| parent | 8d89b5781099d262d72a8197531cf4f10450a1b9 (diff) | |
| download | mariadb-git-35eecf3d65db03b210f75fea8b33834cee62c88f.tar.gz | |
config.h.cmake
- Set SIZEOF_VOIDP the same way as others
- Unindent the no Mac OS settings, to let the checker scripts find the lines
- Removed duplicate SIZEOF_SIZE_T setting
- Added missing value for HAVE_CHARSET_ascii
configure.cmake
- Added HAVE_ prefix to library names, like HAVE_LIBM
- Set HAVE_CXXABI_H if header is found, HAVE_ABI_CXA_DEMANGLE
controls if useful
- Set SIZEOF_VOIDP the same way as others
Diffstat (limited to 'config.h.cmake')
| -rw-r--r-- | config.h.cmake | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/config.h.cmake b/config.h.cmake index cd9305e2b4f..f93cc18a0bc 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -308,21 +308,21 @@ #else #define SIZEOF_LONG 4 #endif + #define SIZEOF_VOIDP SIZEOF_LONG #define SIZEOF_CHARP SIZEOF_LONG #define SIZEOF_SIZE_T SIZEOF_LONG #else - #cmakedefine SIZEOF_LONG @SIZEOF_LONG@ - #cmakedefine SIZEOF_CHARP @SIZEOF_CHARP@ - #cmakedefine SIZEOF_SIZE_T @SIZEOF_CHARP@ +# No indentation, to fetch the lines from verification scripts +#cmakedefine SIZEOF_LONG @SIZEOF_LONG@ +#cmakedefine SIZEOF_VOIDP @SIZEOF_VOIDP@ +#cmakedefine SIZEOF_CHARP @SIZEOF_CHARP@ +#cmakedefine SIZEOF_SIZE_T @SIZEOF_CHARP@ #endif #cmakedefine SIZEOF_CHAR @SIZEOF_CHAR@ #cmakedefine HAVE_CHAR 1 #cmakedefine HAVE_LONG 1 #cmakedefine HAVE_CHARP 1 -#if SIZEOF_CHARP -# define SIZEOF_VOIDP SIZEOF_CHARP -#endif #cmakedefine SIZEOF_SHORT @SIZEOF_SHORT@ #cmakedefine HAVE_SHORT 1 #cmakedefine SIZEOF_INT @SIZEOF_INT@ @@ -333,7 +333,6 @@ #cmakedefine HAVE_OFF_T 1 #cmakedefine SIZEOF_SIGSET_T @SIZEOF_SIGSET_T@ #cmakedefine HAVE_SIGSET_T 1 -#cmakedefine SIZEOF_SIZE_T @SIZEOF_SIZE_T@ #cmakedefine HAVE_SIZE_T 1 #cmakedefine SIZEOF_UCHAR @SIZEOF_UCHAR@ #cmakedefine HAVE_UCHAR 1 @@ -518,7 +517,7 @@ #cmakedefine FN_NO_CASE_SENSE 1 #cmakedefine HAVE_CHARSET_armscii8 1 -#cmakedefine HAVE_CHARSET_ascii +#cmakedefine HAVE_CHARSET_ascii 1 #cmakedefine HAVE_CHARSET_big5 1 #cmakedefine HAVE_CHARSET_cp1250 1 #cmakedefine HAVE_CHARSET_cp1251 1 |