|
From: <wsh...@us...> - 2003-08-22 02:32:57
|
Update of /cvsroot/emc/rcslib/src
In directory sc8-pr-cvs1:/tmp/cvs-serv11714/src
Modified Files:
Tag: wps_multiplat_dev_branch
Makefile rcs_config_include.h
Log Message:
.
Index: Makefile
===================================================================
RCS file: /cvsroot/emc/rcslib/src/Makefile,v
retrieving revision 4.79.2.2
retrieving revision 4.79.2.3
diff -C2 -d -r4.79.2.2 -r4.79.2.3
*** Makefile 8 Aug 2003 15:08:47 -0000 4.79.2.2
--- Makefile 21 Aug 2003 20:24:14 -0000 4.79.2.3
***************
*** 8,12 ****
clean distclean check distcheck install:
! ../etc/multiplatbuild.sh config $@
.PHONY: all config clean distclean check distcheck install
--- 8,12 ----
clean distclean check distcheck install:
! ../etc/multiplatbuild.sh $@
.PHONY: all config clean distclean check distcheck install
Index: rcs_config_include.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/rcs_config_include.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** rcs_config_include.h 8 Aug 2003 14:21:06 -0000 1.1.2.1
--- rcs_config_include.h 21 Aug 2003 20:24:14 -0000 1.1.2.2
***************
*** 148,153 ****
--- 148,155 ----
#endif
#else
+ #ifndef WIN32
#define NO_THREADS 1
#endif
+ #endif
#if HAVE_DIRENT_H
***************
*** 158,161 ****
--- 160,216 ----
#define USE_ITIMER_SIGNALS 1
#endif
+
+ #ifdef WIN32
+
+ #if HAVE_WINDOWS_H
+ #include <windows.h>
+ #endif
+
+ #if HAVE_WINSOCK2_H
+ #include <winsock2.h>
+ #else
+ #if HAVE_WINSOCK_H
+ #include <winsock.h>
+ #endif
+ #endif
+
+ #if HAVE_WINBASE_H
+ #include <winbase.h>
+ #endif
+
+ #if HAVE_WINVER_H
+ #include <winver.h>
+ #endif
+
+ #if HAVE_PROCESS_H
+ #include <process.h>
+ #endif
+
+ #if HAVE_DOS_H
+ #include <dos.h>
+ #endif
+
+ #endif
+ // # ifdef WIN32
+
+ #if HAVE_RPC_RPC_H
+ #include <rpc/rpc.h> /* struct XDR */
+ #else
+ #if HAVE_RPC_TYPES_H
+ #include <rpc/types.h>
+ #endif
+ #if HAVE_RPC_XDR_H
+ #include <rpc/xdr.h> // struct XDR
+ #else
+
+ #if HAVE_XDR_H
+ #include "xdr.h"
+ #endif
+
+ #endif
+ // if HAVE_RPC_XDR_H
+
+ #endif
+ // if HAVE_RPC_RPC_H
#ifndef RCS_FAR
|