From 88c55407aac16e1ed7b3c47d0be6a79d00983fae Mon Sep 17 00:00:00 2001
From: "joreland@mysql.com" <>
Date: Tue, 24 Aug 2004 13:29:08 +0200
Subject: [PATCH] SCO unix compile fix

---
 ndb/src/common/portlib/Makefile.am              | 2 +-
 ndb/src/common/portlib/{NdbTCP.c => NdbTCP.cpp} | 5 +++--
 ndb/src/ndbapi/Ndbinit.cpp                      | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename ndb/src/common/portlib/{NdbTCP.c => NdbTCP.cpp} (96%)

diff --git a/ndb/src/common/portlib/Makefile.am b/ndb/src/common/portlib/Makefile.am
index e6ecb30fe04..6f3a3fe01a9 100644
--- a/ndb/src/common/portlib/Makefile.am
+++ b/ndb/src/common/portlib/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libportlib.la
 
 libportlib_la_SOURCES = \
 	NdbCondition.c NdbMutex.c NdbSleep.c NdbTick.c \
-	NdbEnv.c NdbThread.c NdbHost.c NdbTCP.c	    \
+	NdbEnv.c NdbThread.c NdbHost.c NdbTCP.cpp	    \
 	NdbDaemon.c NdbMem.c
 
 include $(top_srcdir)/ndb/config/common.mk.am
diff --git a/ndb/src/common/portlib/NdbTCP.c b/ndb/src/common/portlib/NdbTCP.cpp
similarity index 96%
rename from ndb/src/common/portlib/NdbTCP.c
rename to ndb/src/common/portlib/NdbTCP.cpp
index 287dc6c2ecd..4bf4936aa30 100644
--- a/ndb/src/common/portlib/NdbTCP.c
+++ b/ndb/src/common/portlib/NdbTCP.cpp
@@ -16,14 +16,15 @@
 
 
 #include <NdbMutex.h>
-#include "NdbTCP.h"
+#include <NdbTCP.h>
 
-#ifdef NDB_WIN32
+#if defined NDB_WIN32 || defined SCO
 static NdbMutex & LOCK_gethostbyname = * NdbMutex_Create();
 #else
 static NdbMutex LOCK_gethostbyname = NDB_MUTEX_INITIALIZER;
 #endif
 
+extern "C"
 int 
 Ndb_getInAddr(struct in_addr * dst, const char *address) {
   struct hostent * hostPtr;
diff --git a/ndb/src/ndbapi/Ndbinit.cpp b/ndb/src/ndbapi/Ndbinit.cpp
index 641919d771b..be168ddffbe 100644
--- a/ndb/src/ndbapi/Ndbinit.cpp
+++ b/ndb/src/ndbapi/Ndbinit.cpp
@@ -43,7 +43,7 @@ static int theNoOfNdbObjects = 0;
 
 static char *ndbConnectString = 0;
 
-#ifdef NDB_WIN32
+#if defined NDB_WIN32 || defined SCO
 static NdbMutex & createNdbMutex = * NdbMutex_Create();
 #else
 static NdbMutex createNdbMutex = NDB_MUTEX_INITIALIZER;