diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-08-01 18:32:01 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-08-01 18:32:01 -0600 |
| commit | c2fa38b930caf77fee12ac798bd0a7a861692b4d (patch) | |
| tree | eb2053de1b6449a6f3fd4310899214b77a02da84 /include | |
| parent | 5161bc9e5327fb26447ec9faa9f1f93d0cc8ac50 (diff) | |
| parent | a328234f607dc19fed4cb5dc97f957ee70294080 (diff) | |
| download | mariadb-git-c2fa38b930caf77fee12ac798bd0a7a861692b4d.tar.gz | |
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
BitKeeper/deleted/.del-CMakeLists.txt~1:
Auto merged
CMakeLists.txt:
Auto merged
configure.in:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 7 | ||||
| -rw-r--r-- | include/config-netware.h | 3 | ||||
| -rw-r--r-- | include/config-win.h | 2 | ||||
| -rw-r--r-- | include/my_global.h | 4 |
4 files changed, 14 insertions, 2 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 0796341cc91..fe54a7e35e0 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -53,8 +53,11 @@ link_sources: @yassl_h_ln_cmd@ echo timestamp > link_sources -my_config.h: ../config.h - $(CP) ../config.h my_config.h +# We want both "my_config.h" and "config.h" that are identical, as +# MySQL sources assumes the name "my_config.h", and 3rd party sources +# assumes the name "config.h". +my_config.h: config.h + $(CP) config.h my_config.h # These files should not be included in distributions since they are # generated by configure from the .h.in files diff --git a/include/config-netware.h b/include/config-netware.h index f7f494b519c..e6bddee034e 100644 --- a/include/config-netware.h +++ b/include/config-netware.h @@ -112,6 +112,9 @@ extern "C" { /* signal by closing the sockets */ #define SIGNAL_WITH_VIO_CLOSE 1 +/* On NetWare, stack grows towards lower address */ +#define STACK_DIRECTION -1 + /* On NetWare, we need to set stack size for threads, otherwise default 16K is used */ #define NW_THD_STACKSIZE 65536 diff --git a/include/config-win.h b/include/config-win.h index fa5c15b0668..bc2ae60f137 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -250,6 +250,8 @@ inline double ulonglong2double(ulonglong value) #endif +#define STACK_DIRECTION -1 + /* Optimized store functions for Intel x86 */ #ifndef _WIN64 diff --git a/include/my_global.h b/include/my_global.h index 91860f6e7a9..8b6cdef8daa 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -804,6 +804,10 @@ typedef SOCKET_SIZE_TYPE size_socket; #define ulong_to_double(X) ((double) (ulong) (X)) #define SET_STACK_SIZE(X) /* Not needed on real machines */ +#ifndef STACK_DIRECTION +#error "please add -DSTACK_DIRECTION=1 or -1 to your CPPFLAGS" +#endif + #if !defined(HAVE_STRTOK_R) #define strtok_r(A,B,C) strtok((A),(B)) #endif |