diff options
author | Narayanan V <v.narayanan@sun.com> | 2008-08-08 14:30:05 +0530 |
---|---|---|
committer | Narayanan V <v.narayanan@sun.com> | 2008-08-08 14:30:05 +0530 |
commit | bd441c4d60e0a31086eab82ea7eb5efe86ca8ece (patch) | |
tree | 30fcd939d206cb1727deb6c43b23c0ca545afd65 /include/mysql.h.pp | |
parent | 3236c07b7f75473bc46da8a526ca9300c6d0b894 (diff) | |
download | mariadb-git-bd441c4d60e0a31086eab82ea7eb5efe86ca8ece.tar.gz |
WL#4380
1) Disabled abi_check rule for all compilers except gcc
2) restored the -dI option to retain the header information.
Makefile.am:
1) changed all-local to depend on a configure variable
that will be set based on if the compiler is gcc.
2) restored the -dI option removed earlier since now
only gcc is being used.
configure.in:
Added a check to see if gcc is being used. If it is being
used set the ABI_CHECK variable to the abi_check target.
include/mysql.h.pp:
The .pp file is changed to correspond to the option
-dI.
Diffstat (limited to 'include/mysql.h.pp')
-rw-r--r-- | include/mysql.h.pp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/mysql.h.pp b/include/mysql.h.pp index d4f92bc2ee5..633cde41130 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -1,5 +1,8 @@ +#include <sys/types.h> typedef char my_bool; typedef int my_socket; +#include "mysql_version.h" +#include "mysql_com.h" enum enum_server_command { COM_SLEEP, COM_QUIT, COM_INIT_DB, COM_QUERY, COM_FIELD_LIST, @@ -143,6 +146,7 @@ char *get_tty_password(const char *opt_message); const char *mysql_errno_to_sqlstate(unsigned int mysql_errno); my_bool my_thread_init(void); void my_thread_end(void); +#include "mysql_time.h" enum enum_mysql_timestamp_type { MYSQL_TIMESTAMP_NONE= -2, MYSQL_TIMESTAMP_ERROR= -1, @@ -155,6 +159,7 @@ typedef struct st_mysql_time my_bool neg; enum enum_mysql_timestamp_type time_type; } MYSQL_TIME; +#include "my_list.h" typedef struct st_list { struct st_list *prev,*next; void *data; @@ -195,6 +200,8 @@ typedef struct st_mysql_field { typedef char **MYSQL_ROW; typedef unsigned int MYSQL_FIELD_OFFSET; typedef unsigned long long my_ulonglong; +#include "typelib.h" +#include "my_alloc.h" typedef struct st_used_mem { struct st_used_mem *next; @@ -232,6 +239,7 @@ typedef struct st_mysql_rows { unsigned long length; } MYSQL_ROWS; typedef MYSQL_ROWS *MYSQL_ROW_OFFSET; +#include "my_alloc.h" typedef struct embedded_query_result EMBEDDED_QUERY_RESULT; typedef struct st_mysql_data { MYSQL_ROWS *data; |