strlcpy.c, strlcat.c, strdup.c, getarg.c, NdbString.h, Epilogue.mk, Defs.mk:

  introduced ndb_global.h and removed som HAVE_ and -D flags
ndb_global.h:
  new file

ndb/Defs.mk

@@ -21,57 +21,34 @@ LIBPREFIX := lib
 fixpath   = $1
 ar_rcs    = $(AR_RCS) $1 $2
 #check-odbc = $(findstring sqlext.h, $(wildcard /usr/include/sqlext.h) $(wildcard /usr/local/include/sqlext.h))
-CCFLAGS_TOP += -DHAVE_STRCASECMP
-
 endif
 
 ifeq ($(NDB_OS), WIN32)
-CCFLAGS_TOP += -DHAVE_STRDUP
-NDB_STRLCPY := Y
-NDB_STRLCAT := Y
 SHLIBEXT  := dll
 endif
 
 ifeq ($(NDB_OS), LINUX)
-CCFLAGS_TOP += -DHAVE_STRDUP
-NDB_STRLCAT := Y
-NDB_STRLCPY := Y
 SHLIBEXT  := so
 endif
 
 ifeq ($(NDB_OS), SOLARIS)
-CCFLAGS_TOP += -DHAVE_STRDUP
-NDB_STRLCAT := Y
-NDB_STRLCPY := Y
 SHLIBEXT  := so
 endif
 
 ifeq ($(NDB_OS), HPUX)
-CCFLAGS_TOP += -DHAVE_STRDUP
-NDB_STRLCAT := Y
-NDB_STRLCPY := Y
 SHLIBEXT := sl
 endif
 
 ifeq ($(NDB_OS), MACOSX)
-CCFLAGS_TOP += -DHAVE_STRLCAT
-CCFLAGS_TOP += -DHAVE_STRLCAT
-CCFLAGS_TOP += -DHAVE_STRLCPY
 CCFLAGS_TOP += -DNDBOUT_UINTPTR
 SHLIBEXT := dylib
 endif
 
 ifeq ($(NDB_OS), OSE)
-NDB_STRDUP := Y
-NDB_STRLCAT := Y
-NDB_STRLCPY := Y
 SHLIBEXT := so
 endif
 
 ifeq ($(NDB_OS), SOFTOSE)
-NDB_STRDUP := Y
-NDB_STRLCAT := Y
-NDB_STRLCPY := Y
 SHLIBEXT := so
 endif
 

ndb/Epilogue.mk

@@ -227,7 +227,7 @@ CCFLAGS_LOC += -I$(call fixpath,$(NDB_TOP)/include/util) \
 BIN_TARGET_LIBS += logger general portlib
 endif
 
-CCFLAGS_LOC += -I$(call fixpath,$(NDB_TOP)/include)
+CCFLAGS_LOC += -I$(call fixpath,$(NDB_TOP)/include) -I$(call fixpath,$(NDB_TOP)/../include)
 
 ifeq ($(NDB_SCI), Y)
 BIN_TARGET_LIBS += sisci

ndb/include/ndb_global.h

+/*#include <my_global.h>*/
+#include <my_config.h>
+

ndb/include/util/NdbString.h

@@ -17,6 +17,7 @@
 #ifndef __NDBSTRING_H_INCLUDED__
 #define __NDBSTRING_H_INCLUDED__
 
+#include <ndb_global.h>
 #include <sys/types.h>
 #include <string.h>
 

ndb/src/common/util/getarg.c

@@ -32,13 +32,9 @@
  * SUCH DAMAGE. 
  */
 
+#include <ndb_global.h>
 #include <ndb_types.h>
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$KTH: getarg.c,v 1.23 2000/09/01 21:25:54 lha Exp $");
-#endif
-
 #include <NdbStdio.h>
 #include <stdlib.h>
 #include <string.h>

ndb/src/common/util/strdup.c

@@ -15,6 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <ndb_global.h>
 #include <stdlib.h>
 
 #ifndef HAVE_STRDUP

ndb/src/common/util/strlcat.c

@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
+#include <ndb_global.h>
 #include <ndb_types.h>
 
 /* RCSID("$KTH: strlcat.c,v 1.1 2000/08/16 01:23:47 lha Exp $"); */

ndb/src/common/util/strlcpy.c

@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
+#include <ndb_global.h>
 #include <ndb_types.h>
 
 /* RCSID("$KTH: strlcpy.c,v 1.1 2000/08/16 01:23:48 lha Exp $"); */