Portability fixes for AIX43

include/my_base.h:
  Portability fix
include/my_global.h:
  Portability fix for AIX43
  (Having _Export gave a lot of errors/warnings and I think this is not needed anymore)
include/my_sys.h:
  Remove compiler warning on AIX43 with xlc_r compiler
include/mysql.h:
  Portability fix
innobase/fil/fil0fil.c:
  Fixed compiler warnings (xlc_r)
libmysql/libmysql.c:
  Portability fix
strings/my_strtoll10.c:
  Portability fix (for AIX43)

4 files changed, 16 insertions, 15 deletions

diff --git a/include/my_base.h b/include/my_base.h
index a1744f37bc6..1bd0f47afa4 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -133,7 +133,7 @@ enum ha_extra_function {
   HA_EXTRA_RETRIEVE_ALL_COLS,
   HA_EXTRA_PREPARE_FOR_DELETE,
   HA_EXTRA_PREPARE_FOR_UPDATE,		/* Remove read cache if problems */
-  HA_EXTRA_PRELOAD_BUFFER_SIZE,         /* Set buffer size for preloading */
+  HA_EXTRA_PRELOAD_BUFFER_SIZE          /* Set buffer size for preloading */
 };
 
 	/* The following is parameter to ha_panic() */
diff --git a/include/my_global.h b/include/my_global.h
index 43cacf8fa65..b5b78774e91 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -688,7 +688,8 @@ typedef long long	my_ptrdiff_t;
 #endif
 #endif
 #if defined(__IBMC__) || defined(__IBMCPP__)
-#define STDCALL _System _Export
+/* This was  _System _Export but caused a lot of warnings on _AIX43 */
+#define STDCALL
 #elif !defined( STDCALL)
 #define STDCALL
 #endif
diff --git a/include/my_sys.h b/include/my_sys.h
index 25c450e5d2b..bc43a59172e 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -160,7 +160,7 @@ extern char *my_strdup_with_length(const byte *from, uint length,
 #endif
 
 #ifdef HAVE_ALLOCA
-#if defined(_AIX) && !defined(__GNUC__)
+#if defined(_AIX) && !defined(__GNUC__) && !defined(_AIX43)
 #pragma alloca
 #endif /* _AIX */
 #if defined(__GNUC__) && !defined(HAVE_ALLOCA_H)
diff --git a/include/mysql.h b/include/mysql.h
index b31c04c755b..7df42460c6d 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -552,27 +552,27 @@ typedef struct st_mysql_stmt
 
 typedef struct st_mysql_methods
 {
-  my_bool (STDCALL *read_query_result)(MYSQL *mysql);
-  my_bool (STDCALL *advanced_command)(MYSQL *mysql,
+  my_bool (* STDCALL read_query_result)(MYSQL *mysql);
+  my_bool (* STDCALL advanced_command)(MYSQL *mysql,
 				      enum enum_server_command command,
 				      const char *header,
 				      unsigned long header_length,
 				      const char *arg,
 				      unsigned long arg_length,
 				      my_bool skip_check);
-  MYSQL_DATA *(STDCALL *read_rows)(MYSQL *mysql,MYSQL_FIELD *mysql_fields,
+  MYSQL_DATA *(* STDCALL read_rows)(MYSQL *mysql,MYSQL_FIELD *mysql_fields,
 				   unsigned int fields);
-  MYSQL_RES * (STDCALL *use_result)(MYSQL *mysql);
-  void (STDCALL *fetch_lengths)(unsigned long *to, 
+  MYSQL_RES * (* STDCALL use_result)(MYSQL *mysql);
+  void (* STDCALL fetch_lengths)(unsigned long *to, 
 				MYSQL_ROW column, unsigned int field_count);
 #if !defined(MYSQL_SERVER) || defined(EMBEDDED_LIBRARY)
-  MYSQL_FIELD * (STDCALL *list_fields)(MYSQL *mysql);
-  my_bool (STDCALL *read_prepare_result)(MYSQL *mysql, MYSQL_STMT *stmt);
-  int (STDCALL *stmt_execute)(MYSQL_STMT *stmt);
-  MYSQL_DATA *(STDCALL *read_binary_rows)(MYSQL_STMT *stmt);
-  int (STDCALL *unbuffered_fetch)(MYSQL *mysql, char **row);
-  void (STDCALL *free_embedded_thd)(MYSQL *mysql);
-  const char *(STDCALL *read_statistic)(MYSQL *mysql);
+  MYSQL_FIELD * (* STDCALL list_fields)(MYSQL *mysql);
+  my_bool (* STDCALL read_prepare_result)(MYSQL *mysql, MYSQL_STMT *stmt);
+  int (* STDCALL stmt_execute)(MYSQL_STMT *stmt);
+  MYSQL_DATA *(* STDCALL read_binary_rows)(MYSQL_STMT *stmt);
+  int (* STDCALL unbuffered_fetch)(MYSQL *mysql, char **row);
+  void (* STDCALL free_embedded_thd)(MYSQL *mysql);
+  const char *(* STDCALL read_statistic)(MYSQL *mysql);
 #endif
 } MYSQL_METHODS;