From 63b4095284d7dfbf8ae7233ad9bcebe260ec92ed Mon Sep 17 00:00:00 2001
From: unknown <joreland@mysql.com>
Date: Wed, 10 Nov 2004 14:18:49 +0100
Subject: wl1744 - nbd windoze port

ndb/include/logger/SysLogHandler.hpp:
  win-port
ndb/include/ndb_global.h:
  win-port
ndb/include/portlib/PortDefs.h:
  win-port
ndb/src/common/mgmcommon/NdbConfig.c:
  win-port
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  win-port
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  win-port
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  win-port
ndb/src/kernel/main.cpp:
  win-port
ndb/src/kernel/vm/Configuration.cpp:
  win-port
ndb/src/kernel/vm/Emulator.cpp:
  win-port
ndb/src/mgmsrv/CommandInterpreter.cpp:
  win-port
ndb/src/mgmsrv/main.cpp:
  win-port
scripts/make_win_src_distribution.sh:
  win-port
---
 ndb/include/ndb_global.h | 45 +++++++++++++++++++++------------------------
 1 file changed, 21 insertions(+), 24 deletions(-)

(limited to 'ndb/include/ndb_global.h')

diff --git a/ndb/include/ndb_global.h b/ndb/include/ndb_global.h
index bdd4e503cc5..775d69b38e5 100644
--- a/ndb/include/ndb_global.h
+++ b/ndb/include/ndb_global.h
@@ -2,16 +2,23 @@
 #ifndef NDBGLOBAL_H
 #define NDBGLOBAL_H
 
-#include <my_global.h>
-
-/** signal & SIG_PIPE */
-#include <my_alarm.h>
+#include <ndb_types.h>
 
 #if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32)
 #define NDB_WIN32
+#include <winsock2.h>
+#include <my_global.h>
+#include <m_ctype.h>
+
+#define PATH_MAX 256
+#define DIR_SEPARATOR "\\"
+
+#pragma warning(disable: 4503 4786)
+
 #else
 #undef NDB_WIN32
-#endif
+#include <my_global.h>
+#include <my_alarm.h>
 
 #ifdef _AIX
 #undef _H_STRINGS
@@ -47,23 +54,22 @@
 #include <sys/mman.h>
 #endif
 
-#ifdef NDB_WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-
-#define DIR_SEPARATOR "\\"
-#define PATH_MAX 256
+#define DIR_SEPARATOR "/"
 
-#pragma warning(disable: 4503 4786)
-#else
+#endif
 
-#define DIR_SEPARATOR "/"
+#ifndef HAVE_STRDUP
+extern char * strdup(const char *s);
+#endif
 
+#ifndef HAVE_STRCASECMP
+extern int strcasecmp(const char *s1, const char *s2);
+extern int strncasecmp(const char *s1, const char *s2, size_t n);
 #endif
 
 static const char table_name_separator =  '/';
 
-#if defined(_AIX) || defined(NDB_VC98)
+#if defined(_AIX) || defined(WIN32) || defined(NDB_VC98)
 #define STATIC_CONST(x) enum { x }
 #else
 #define STATIC_CONST(x) static const Uint32 x
@@ -84,15 +90,6 @@ extern int ndb_init(void);
 extern void ndb_end(int);
 #define NDB_INIT(prog_name) {my_progname=(prog_name); ndb_init();}
 
-#ifndef HAVE_STRDUP
-extern char * strdup(const char *s);
-#endif
-
-#ifndef HAVE_STRCASECMP
-extern int strcasecmp(const char *s1, const char *s2);
-extern int strncasecmp(const char *s1, const char *s2, size_t n);
-#endif
-
 #ifdef SCO
 
 #ifndef PATH_MAX
-- 
cgit v1.2.1