diff options
| author | unknown <serg@janus.mylan> | 2007-02-21 11:36:23 +0100 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-02-21 11:36:23 +0100 |
| commit | bd475445612d312689c70dda67f3ca67c0db7876 (patch) | |
| tree | 8baa0ee731a4b567ed44cf3227cdb9a926354ef6 /include/my_global.h | |
| parent | 7fa4131274acc7073dc08d1f97eab08c8bd89e39 (diff) | |
| parent | 6a575c2a91ceb29ffdf14a524be02a6b05e321fd (diff) | |
| download | mariadb-git-bd475445612d312689c70dda67f3ca67c0db7876.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
dbug/dbug.c:
Auto merged
include/my_base.h:
Auto merged
include/my_global.h:
Auto merged
sql/event_db_repository.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_servers.cc:
Auto merged
sql/sql_servers.h:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
sql/tztime.cc:
Auto merged
storage/heap/ha_heap.cc:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
support-files/Makefile.am:
Auto merged
sql/opt_range.cc:
manual merge
storage/example/ha_example.cc:
manual merge
storage/federated/ha_federated.cc:
manual merge
storage/myisam/ha_myisam.cc:
manual merge
storage/myisam/mi_rkey.c:
manual merge
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index 98733711d24..d788bc69c9f 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -987,7 +987,7 @@ typedef long int32; typedef unsigned long uint32; #endif #else -#error "Neither int or long is of 4 bytes width" +#error Neither int or long is of 4 bytes width #endif #if !defined(HAVE_ULONG) && !defined(__USE_MISC) @@ -1017,6 +1017,14 @@ typedef unsigned __int64 my_ulonglong; typedef unsigned long long my_ulonglong; #endif +#if SIZEOF_CHARP == SIZEOF_INT +typedef int intptr; +#elif SIZEOF_CHARP == SIZEOF_LONG +typedef long intptr; +#else +#error sizeof(void *) is neither sizeof(int) nor sizeof(long) +#endif + #ifdef USE_RAID /* The following is done with a if to not get problems with pre-processors |