diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-05-10 15:06:35 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-05-10 15:06:35 -0600 |
| commit | 9192600eb7c52f2675a67548849409dec2364165 (patch) | |
| tree | 32fd0eb2c34334b7806726cf2dc9f8a893ea6fc8 /include | |
| parent | 9afb49f53cb7b8da7519f45f588a78b559013de3 (diff) | |
| parent | b59b5f4b6ec6bd5b0eb8cee832b6d4f51fa646fc (diff) | |
| download | mariadb-git-9192600eb7c52f2675a67548849409dec2364165.tar.gz | |
Merged with 3.23, needs further fix-up
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
acconfig.h:
Auto merged
acinclude.m4:
Auto merged
include/myisam.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7:
Auto merged
BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439:
Auto merged
client/mysqltest.c:
Auto merged
sql/lex.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
Docs/manual.texi:
merged
client/errmsg.c:
merged
configure.in:
merged
sql/mysqld.cc:
merged
sql/sql_select.cc:
merged, needs manual fixing
sql/sql_yacc.yy:
merged, needs manual fixing
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 3 | ||||
| -rw-r--r-- | include/m_ctype.h | 1 | ||||
| -rw-r--r-- | include/myisam.h | 6 | ||||
| -rw-r--r-- | include/mysql.h | 8 |
4 files changed, 14 insertions, 4 deletions
diff --git a/include/global.h b/include/global.h index 2c9157630f4..a11600a96fc 100644 --- a/include/global.h +++ b/include/global.h @@ -332,7 +332,8 @@ typedef int File; /* File descriptor */ typedef int my_socket; /* File descriptor for sockets */ #define INVALID_SOCKET -1 #endif -typedef RETSIGTYPE sig_handler; /* Function to handle signals */ +/* Type for fuctions that handles signals */ +#define sig_handler RETSIGTYPE typedef void (*sig_return)();/* Returns type from signal */ #if defined(__GNUC__) && !defined(_lint) typedef char pchar; /* Mixed prototypes can take char */ diff --git a/include/m_ctype.h b/include/m_ctype.h index 438b7b34c9a..645c07b79ae 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -66,6 +66,7 @@ extern CHARSET_INFO compiled_charsets[]; #endif /* Don't include std ctype.h when this is included */ #define _CTYPE_H +#define _CTYPE_H_ #define _CTYPE_INCLUDED #define __CTYPE_INCLUDED #define _CTYPE_USING /* Don't put names in global namespace. */ diff --git a/include/myisam.h b/include/myisam.h index 8139faaa14e..8e68a3f75c9 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -333,9 +333,9 @@ typedef struct st_mi_check_param ulonglong unique_count[MI_MAX_KEY_SEG+1]; ha_checksum key_crc[MI_MAX_POSSIBLE_KEY]; ulong rec_per_key_part[MI_MAX_KEY_SEG*MI_MAX_POSSIBLE_KEY]; - void* thd; - char* table_name; - char* op_name; + void *thd; + char *db_name,*table_name; + char *op_name; } MI_CHECK; diff --git a/include/mysql.h b/include/mysql.h index 350ce860a2f..b5d918a98af 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -20,6 +20,14 @@ #ifndef _mysql_h #define _mysql_h +#ifdef __CYGWIN__ /* CYGWIN implements a UNIX API */ +#undef WIN +#undef _WIN +#undef _WIN32 +#undef _WIN64 +#undef __WIN__ +#endif + #ifndef MYSQL_SERVER #ifdef __cplusplus extern "C" { |