From 644320cbc31383ba9f930a695c53ce5b04a4da53 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Tue, 16 Jun 1998 02:10:39 +0000
Subject: [PATCH] cvtFast.h

---
 src/libCom/Makefile.Host     | 8 +++++---
 src/libCom/Makefile.Vx       | 6 ++++--
 src/libCom/cvtFast.h         | 2 +-
 src/libCom/cvtFast/cvtFast.h | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/libCom/Makefile.Host b/src/libCom/Makefile.Host
index c4e22b300..6db5dad3b 100644
--- a/src/libCom/Makefile.Host
+++ b/src/libCom/Makefile.Host
@@ -31,12 +31,13 @@ INC += osiTimer.h
 INC += macLib.h
 INC += sigPipeIgnore.h
 INC += dbmf.h
-INC += ipAddrToA.h
 INC += epicsString.h
 INC += truncateFile.h
 INC += adjustment.h
 INC += postfix.h
 INC += sCalcPostfix.h
+INC += osiSleep.h
+INC += bsdSocketResource.h
 
 #	For WIN32 we supply getopt as part of libCom:
 INC_WIN32 := getopt.h
@@ -70,11 +71,12 @@ LIBSRCS += macCore.c
 LIBSRCS += macUtil.c
 LIBSRCS += sigPipeIgnore.c
 LIBSRCS += dbmf.c
-LIBSRCS += ipAddrToA.c
 LIBSRCS += epicsString.c
 LIBSRCS += truncateFile.c
 LIBSRCS += aToIPAddr.c
 LIBSRCS += adjustment.c
+LIBSRCS += bsdSockResource.c
+LIBSRCS += osiSleep.c
 
 #
 # if CPLUSPLUS isnt empty then include C++ src codes
@@ -88,7 +90,7 @@ LIBSRCS += $(patsubst %,osdTime.cc,$(strip $(CPLUSPLUS)))
 
 #	WIN32 has no getopt, we add it to the Com lib,
 #	special initialisation is done in winmain.c
-LIBSRCS_WIN32 := getopt.c dllmain.cc
+LIBSRCS_WIN32 := getopt.c dllmain.cc getLastWSAErrorAsString.c
 
 #       Library to build:
 #       lib$(LIBRARY).a  or   ..dll/..exp/..lib
diff --git a/src/libCom/Makefile.Vx b/src/libCom/Makefile.Vx
index 0ddb1d07d..407af6e67 100644
--- a/src/libCom/Makefile.Vx
+++ b/src/libCom/Makefile.Vx
@@ -28,12 +28,13 @@ SRCS.c += ../macCore.c
 SRCS.c += ../macUtil.c
 #SRCS.c += ../osiTimer.cc
 #SRCS.c += ../os/vxWorks/osdTime.cc
-SRCS.c += ../os/vxWorks/ipAddrToA.c
 SRCS.c += ../os/vxWorks/sigPipeIgnore.c
 SRCS.c += ../dbmf.c
 SRCS.c += ../epicsString.c
 SRCS.c += ../aToIPAddr.c
 SRCS.c += ../adjustment.c
+SRCS.c += ../os/vxWorks/bsdSockResource.c
+SRCS.c += ../os/vxWorks/osiSleep.c
 
 LIBOBJS += cvtFast.o
 LIBOBJS += ellLib.o
@@ -57,12 +58,13 @@ LIBOBJS += macCore.o
 LIBOBJS += macUtil.o
 #LIBOBJS += osiTimer.o
 #LIBOBJS += osdTime.o
-LIBOBJS += ipAddrToA.o
 LIBOBJS += sigPipeIgnore.o
 LIBOBJS += dbmf.o
 LIBOBJS += epicsString.o
 LIBOBJS += aToIPAddr.o
 LIBOBJS += adjustment.o
+LIBOBJS += bsdSockResource.o
+LIBOBJS += osiSleep.o
 
 LIBNAME = libCom
 
diff --git a/src/libCom/cvtFast.h b/src/libCom/cvtFast.h
index edcac74b6..058420afb 100644
--- a/src/libCom/cvtFast.h
+++ b/src/libCom/cvtFast.h
@@ -51,7 +51,7 @@ extern "C" {
 
 #include "shareLib.h"
 
-#ifdef __STDC__
+#if defined(__STDC__) || defined(__cplusplus)
 
 /*
  * each of these functions return the number of characters "transmitted"
diff --git a/src/libCom/cvtFast/cvtFast.h b/src/libCom/cvtFast/cvtFast.h
index edcac74b6..058420afb 100644
--- a/src/libCom/cvtFast/cvtFast.h
+++ b/src/libCom/cvtFast/cvtFast.h
@@ -51,7 +51,7 @@ extern "C" {
 
 #include "shareLib.h"
 
-#ifdef __STDC__
+#if defined(__STDC__) || defined(__cplusplus)
 
 /*
  * each of these functions return the number of characters "transmitted"