[Emc-commit] rcslib/src/nt_xdr Makefile,4.33,4.33.2.1 xdr.h,4.33,4.33.2.1 xdrtypes.h,4.33,4.33.2.1

[<wsh...@us...>]

Update of /cvsroot/emc/rcslib/src/nt_xdr
In directory sc8-pr-cvs1:/tmp/cvs-serv11714/src/nt_xdr

Modified Files:
      Tag: wps_multiplat_dev_branch
	Makefile xdr.h xdrtypes.h 
Log Message:
.

Index: Makefile
===================================================================
RCS file: /cvsroot/emc/rcslib/src/nt_xdr/Makefile,v
retrieving revision 4.33
retrieving revision 4.33.2.1
diff -C2 -d -r4.33 -r4.33.2.1
*** Makefile	7 May 2003 19:35:29 -0000	4.33
--- Makefile	21 Aug 2003 20:24:14 -0000	4.33.2.1
***************
*** 1,2 ****
--- 1,19 ----
+ ifndef USE_OLD_RCSLIB_MAKEFILES
+ 
+ all:
+ 	../../etc/multiplatbuild.sh
+ 
+ config:
+ 	../../etc/multiplatbuild.sh config $(CONFIG_ARGS)
+ 
+ clean distclean check distcheck install:
+ 	../../etc/multiplatbuild.sh $@
+ 
+ .PHONY: all config clean distclean check distcheck install
+ 
+ 
+ else
+ 
+ 
  # Makefile for the Operating System interface  modules of the
  # RCS Library
***************
*** 37,38 ****
--- 54,58 ----
  #Application Makefile for inclusion
  include ../Makefile.rcs
+ 
+ endif
+ # ifndef USE_OLD_RCSLIB_MAKEFILES

Index: xdr.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/nt_xdr/xdr.h,v
retrieving revision 4.33
retrieving revision 4.33.2.1
diff -C2 -d -r4.33 -r4.33.2.1
*** xdr.h	6 May 2003 15:18:20 -0000	4.33
--- xdr.h	21 Aug 2003 20:24:15 -0000	4.33.2.1
***************
*** 51,55 ****
  
  #if !defined(_WINDOWS) && !defined(WIN32)
! #error This version of XDR only for Windows NT.
  #endif
  
--- 51,55 ----
  
  #if !defined(_WINDOWS) && !defined(WIN32)
! #error This version of XDR only for MS Windows.
  #endif
  
***************
*** 59,63 ****
--- 59,66 ----
  #include "xdrtypes.h"
  
+ #ifndef _X86_
  #define _X86_
+ #endif
+ 
  /*
   * XDR provides a conventional way for converting between C data

Index: xdrtypes.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/nt_xdr/xdrtypes.h,v
retrieving revision 4.33
retrieving revision 4.33.2.1
diff -C2 -d -r4.33 -r4.33.2.1
*** xdrtypes.h	6 May 2003 15:18:21 -0000	4.33
--- xdrtypes.h	21 Aug 2003 20:24:15 -0000	4.33.2.1
***************
*** 90,98 ****
--- 90,106 ----
  #endif
  
+ #ifndef HAVE__CADDR_T
  typedef char *caddr_t;
+ #endif
  #ifndef mingw32
+ #ifndef HAVE_U_INT
  typedef unsigned int u_int;
+ #endif
+ #ifndef HAVE_U_LONG
  typedef unsigned long u_long;
+ #endif
+ #ifndef HAVE_U_SHORT
  typedef unsigned short u_short;
+ #endif
  #else
  #include <winsock2.h>