Commit 4154eb9a authored by unknown's avatar unknown
Browse files

BUG#21253 NdbApi.h should not include my_config.h 


config/ac-macros/ha_ndbcluster.m4:
  re-introduce NDB_SIZEOF substitutions to prevent NdbApi depending on my_config
  which causes problems for autotools enabled ndbapi programs
storage/ndb/include/ndb_types.h.in:
  remove dependency on my_config.h that was causing problems for ndbapi programs
  using autoconf
parent 405c3c9a

config/ac-macros/ha_ndbcluster.m4

+13 −0
Original line number Diff line number Diff line
@@ -308,6 +308,19 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ 
  AC_SUBST(NDB_DEFS)

  AC_SUBST(ndb_cxxflags_fix)



  NDB_SIZEOF_CHARP="$ac_cv_sizeof_charp"

  NDB_SIZEOF_CHAR="$ac_cv_sizeof_char"

  NDB_SIZEOF_SHORT="$ac_cv_sizeof_short"

  NDB_SIZEOF_INT="$ac_cv_sizeof_int"

  NDB_SIZEOF_LONG="$ac_cv_sizeof_long"

  NDB_SIZEOF_LONG_LONG="$ac_cv_sizeof_long_long"

  AC_SUBST([NDB_SIZEOF_CHARP])

  AC_SUBST([NDB_SIZEOF_CHAR])

  AC_SUBST([NDB_SIZEOF_SHORT])

  AC_SUBST([NDB_SIZEOF_INT])

  AC_SUBST([NDB_SIZEOF_LONG])

  AC_SUBST([NDB_SIZEOF_LONG_LONG])



  AC_CONFIG_FILES(storage/ndb/include/Makefile dnl

   storage/ndb/src/Makefile storage/ndb/src/common/Makefile dnl

   storage/ndb/docs/Makefile dnl

storage/ndb/include/ndb_types.h.in

+6 −8
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
#ifndef NDB_TYPES_H

#define NDB_TYPES_H



#include <my_config.h>



#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(_WIN64)

#define NDB_SIZEOF_CHARP SIZEOF_CHARP

#define NDB_SIZEOF_CHAR SIZEOF_CHAR
@@ -33,12 +31,12 @@ 
typedef unsigned __int64 Uint64;

typedef   signed __int64 Int64;

#else

#define NDB_SIZEOF_CHARP SIZEOF_CHARP

#define NDB_SIZEOF_CHAR SIZEOF_CHAR

#define NDB_SIZEOF_INT SIZEOF_INT

#define NDB_SIZEOF_SHORT SIZEOF_SHORT

#define NDB_SIZEOF_LONG SIZEOF_LONG

#define NDB_SIZEOF_LONG_LONG SIZEOF_LONG_LONG

#define NDB_SIZEOF_CHARP @NDB_SIZEOF_CHARP@

#define NDB_SIZEOF_CHAR @NDB_SIZEOF_CHAR@

#define NDB_SIZEOF_INT @NDB_SIZEOF_INT@

#define NDB_SIZEOF_SHORT @NDB_SIZEOF_SHORT@

#define NDB_SIZEOF_LONG @NDB_SIZEOF_LONG@

#define NDB_SIZEOF_LONG_LONG @NDB_SIZEOF_LONG_LONG@

typedef unsigned long long Uint64;

typedef   signed long long Int64;

#endif