diff options
| author | unknown <serg@serg.mylan> | 2004-07-20 15:34:57 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-07-20 15:34:57 +0200 |
| commit | e2d25910f8d5a5edacf3b64ad24f7e9dcd06123f (patch) | |
| tree | 25cbffcf973dd7f352a4bcdc885aa172cb20a57a /include/my_global.h | |
| parent | 3f5e1ba9ea87087836dcf311a174f4aae3d4cb5b (diff) | |
| parent | 26821ee3f584a79cfaf4339c0b5c45307be21986 (diff) | |
| download | mariadb-git-e2d25910f8d5a5edacf3b64ad24f7e9dcd06123f.tar.gz | |
manual merge
client/mysql.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
include/my_global.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/system_mysql_db.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/my_global.h b/include/my_global.h index df42a91a739..a6a777e8eaf 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -120,26 +120,6 @@ #define __STDC_EXT__ 1 /* To get large file support on hpux */ #endif -#ifdef HPUX11 -/* - Fix warnings on HPUX11 - There is something really strange with HPUX11 include files as you get - error about wrongly declared symbols or missing defines if you don't - do the following: - */ -#if !defined(_XOPEN_SOURCE_EXTENDED) && ! defined(__cplusplus) -#define _XOPEN_SOURCE_EXTENDED 1 -#endif - -/* Fix type of socklen as this is depending on the above define */ -#undef SOCKET_SIZE_TYPE -#ifdef _XOPEN_SOURCE_EXTENDED -#define SOCKET_SIZE_TYPE socklen_t -#else -#define SOCKET_SIZE_TYPE int -#endif /* _XOPEN_SOURCE_EXTENDED */ -#endif /* HPUX11 */ - #if defined(THREAD) && !defined(__WIN__) && !defined(OS2) #ifndef _POSIX_PTHREAD_SEMANTICS #define _POSIX_PTHREAD_SEMANTICS /* We want posix threads */ |