emc-commit — CVS commit notification list.

[Emc-commit] rcslib/src/cms cms_clnt_info.hh,NONE,1.1.2.1

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

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

Added Files:
      Tag: wps_multiplat_dev_branch
	cms_clnt_info.hh 
Log Message:
.

--- NEW FILE: cms_clnt_info.hh ---

#ifndef CMS_CLNT_INFO_HH
#define CMS_CLNT_INFO_HH

#include "rem_msg.hh" 		// REMOTE_CLIENT_ID

class CMS_CLIENT_INFO;

class CMS_MSG_INFO
{
  CMS_MSG_INFO ();
  ~CMS_MSG_INFO ();

public:
  friend CMS_CLIENT_INFO;

  void *addr;
  size_t size;
  int deleteaddr;
};

class CMS_CLIENT_INFO
{
public:
  REMOTE_CLIENT_ID id;
  CMS_MSG_INFO last_message_info;
};

#endif
// CMS_CLNT_INFO_HH

[Emc-commit] rcslib/src/cms filemem_no_config.h,NONE,1.1.2.1 nml_srv_no_config.h,NONE,1.1.2.1 physmem_no_config.h,NONE,1.1.2.1 recvline_no_config.h,NONE,1.1.2.1 stcpopts_no_config.h,NONE,1.1.2.1 ttyintf_no_config.h,NONE,1.1.2.1 udp_srv_no_config.h,NONE,1.1.2.1 udpmem_no_config.h,NONE,1.1.2.1

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

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

Added Files:
      Tag: wps_multiplat_dev_branch
	filemem_no_config.h nml_srv_no_config.h physmem_no_config.h 
	recvline_no_config.h stcpopts_no_config.h ttyintf_no_config.h 
	udp_srv_no_config.h udpmem_no_config.h 
Log Message:
.

--- NEW FILE: filemem_no_config.h ---
#ifndef FILEMEM_NO_CONFIG_H
#define FILEMEM_NO_CONFIG_H

#if defined(VXWORKS) || defined(DOS_WINDOWS) || defined(lynxosPC)
#ifdef USE_FCNTL_FILE_LOCKING
#undef USE_FCNTL_FILE_LOCKING
#endif
#endif

#if !defined(USE_FCNTL_FILE_LOCKING) && !defined(MSDOS)
#define FILEMEM_USE_SEMAPHORES
#endif

#include "rcs_defs.hh"		// DOS_WINDOWS
#include <stdio.h>		// FILE *, fpos_t

#ifdef FILEMEM_USE_SEMAPHORES
#include "sem.hh"		// class RCS_SEMAPHORE

#if  !defined(DOS_WINDOWS) && !defined(VXWORKS)
#include <sys/types.h>		/* key_t */
#include <sys/ipc.h>
#include <sys/sem.h>
#endif

#include <stddef.h>		/* size_t */

#ifndef KEY_T_DEFINED

#ifdef VXWORKS
typedef int key_t;		/* key_t is not defined in VxWorks or  Windows -- do
				   it here, and it should be visible
				   throughout all the shared mem code */
#endif

#ifdef WIN32
typedef long key_t;
#endif
#endif

#endif


#ifdef USE_FCNTL_FILE_LOCKING
#include <sys/fcntl.h>
#endif

#ifdef sunos4
// The sunos4 header files say that fgetpos and fsetpos take a pointer to a
// a long even though ANSI says they should take an fpos_t.
typedef long fpos_t;
#endif


#ifdef EXTERN_C_STD_HEADERS
extern "C"
{
#endif

#include <stdlib.h>		// malloc()
#include <string.h>		// strcpy(), strcmp()
#include <errno.h>		// errno


#ifdef  USE_FCNTL_FILE_LOCKING
#include <fcntl.h>
#endif

#if defined(USE_FCNTL_FILE_LOCKING) && defined(FILEMEM_USE_SEMAPHORES)
#error Can not compile with both defined(USE_FCNTL_FILE_LOCKING && FILEMEM_USE_SEMAPHORES)
#endif

#if defined(lynxosPC) || defined(sunos4)

// no prototypes for these in LynxOS-- how lame. Let's do them here

#include <stdio.h>		/* ftell(), fpos_t */
#include <unistd.h>		// SEEK_SET

  static int fgetpos (FILE * stream, fpos_t * ptr);
  static int fsetpos (FILE * stream, const fpos_t * ptr);

// FIXME-- test these!

  int fgetpos (FILE * stream, fpos_t * ptr)
  {
    long retval;

      retval = ftell (stream);

    if (retval == -1L)
      {
	return -1;
      }
    else
      {
	*ptr = (fpos_t) retval;
	return 0;
      }
  }

  int fsetpos (FILE * stream, const fpos_t * ptr)
  {
    return fseek (stream, (long) *ptr, SEEK_SET);
  }

#endif

#ifdef EXTERN_C_STD_HEADERS
}
#endif


#endif
//  FILEMEM_NO_CONFIG_H

--- NEW FILE: nml_srv_no_config.h ---
#ifndef NML_SRV_NO_CONFIG_H
#define NML_SRV_NO_CONFIG_H

#include "rcs_defs.hh"		/* EXTERN_C_STD_HEADERS  */

#ifdef EXTERN_C_STD_HEADERS
extern "C"
{
#endif

#include <string.h>		/* memcpy() */

#if defined(WIN32) && !defined(gnuwin32)
#if defined(WIN32) && !defined(USE_OLD_WINSOCK)
// Lame problem if windows.h is included before winsock2.h many redefined
// compiler errors result.
#include <winsock2.h>
#endif

#include <windows.h>		/* GetCurrentProcessId(), GetCurrentThreadID() */
#else
#include <signal.h>		/* kill() */
#include <sys/types.h>
#include <unistd.h>		/* getpid() */
#include <sys/wait.h>		/* waitpid() */
#include <stdlib.h>		/* atexit() */
#ifdef VXWORKS
#include <taskLib.h>		/* taskIdSelf() */
#endif
#endif

#ifdef EXTERN_C_STD_HEADERS
}
#endif

#endif
// NML_SRV_NO_CONFIG_H

--- NEW FILE: physmem_no_config.h ---
#ifndef PHYSMEM_NO_CONFIG_H
#define PHYSMEM_NO_CONFIG_H

#include "rcs_defs.hh"		/* __MSDOS__, RCS_FAR, EXTERN_C_STD_HEADERS  */

#ifdef WIN16
#include <windows.h>		/* LPBYTE, WORD */
typedef LPBYTE LOCAL_ADDRESS_TYPE;
#else
typedef char *LOCAL_ADDRESS_TYPE;
#endif

#if defined(WIN32) && !defined(gnuwin32)
#if defined(WIN32) && !defined(USE_OLD_WINSOCK)
/* Lame problem if windows.h is included before winsock2.h many redefined
 compiler errors result. */
#include <winsock2.h>
#endif
#include <windows.h>		/* HANDLE */
#include "mapmem.h"		/* PHYSICAL_MEMORY_INFO */
#include "gpioctl.h"		/* GENPORT_WRITE_INPUT */
#endif

#if defined(USE_BIT3) && defined(WIN32)
#include "btapi.h"
#endif

/* ADDRESS TYPE MACROS --
* Under Windows Pass one of these as the _address_code for
* PHYSMEM_HANDLE */
#define NT_ISA_MEM_ADDRESS      ((long) 1)
#define NT_ISA_IO_ADDRESS       ((long) 2)

#include "dbg_mem.h"		// DEBUG_MALLOC, DEBUG_FREE

#ifdef EXTERN_C_STD_HEADERS
extern "C"
{
#endif


#include <string.h>		/* memcpy(), memset() */
#ifndef NO_STDIO
#include <stdio.h>		// sprintf()
#endif
#include <stdlib.h>		/* malloc() */

#ifdef  lynxosPC

#include <smem.h>
#include <errno.h>

#endif

#ifdef LINUX_VME
#include <sys/types.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/mman.h>
#endif


#ifdef VXWORKS
#include "vxWorks.h"
#include "sysLib.h"		/* sysBusToLocalAdrs() */
#include "vme.h"		/* VME_AM_STD_USR_DATA */
#endif

#ifdef EXTERN_C_STD_HEADERS
}
#endif

#ifdef USE_BIT3
#ifndef USING_BIT3
#define USING_BIT3
#endif
#endif

#ifdef USING_BIT3
#ifndef USE_BIT3
#define USE_BIT3
#endif
#endif

#endif
// PHYSMEM_NO_CONFIG_H

--- NEW FILE: recvline_no_config.h ---
#ifndef RECVLINE_NO_CONFIG_H
#define RECVLINE_NO_CONFIG_H

#include "rcs_defs.hh"		/* _Windows */

#if (!defined(_Windows) && !defined(MSDOS)) || defined(gnuwin32)
#include <unistd.h>		/*  select() */
#include <sys/types.h>		/* typedef fd_set, FD_ZERO, FD_SET */
#include <sys/socket.h>		/* recv() */
#ifndef VXWORKS
#include <sys/time.h>		/* struct timeval */
#else
#include <sys/times.h>		/* struct timeval */
#endif
#else
#ifdef _Windows
#ifdef USE_OLD_WINSOCK
#include <winsock.h>		/* select(), typedef fd_set, FD_ZERO, FD_SET, struct */
#else
#include <winsock2.h>
#endif
#else
#include <tklib.h>		/* select(), recv(), typedef fd_set, FD_ZERO, FD_SET */
#include <tk_errno.h>		/* tk_geterrno(), EWOULDBLOCK */
#endif
#endif
#include <stddef.h>		/* size_t */
#include <errno.h>		/* errno */
#include <stdlib.h>		/* malloc(), free() */
#include <string.h>		/* strerror() */
#include <math.h>		/* modf(), fabs() */

#endif
//  RECVLINE_NO_CONFIG_H


--- NEW FILE: stcpopts_no_config.h ---
#ifndef STCPOPTS_NO_CONFIG_H
#define STCPOPTS_NO_CONFIG_H

// This is neccessary to avoid muliple definitions of fd_set, etc when both
// RPC via PCNFS and Windows Sockets are to be available
#ifdef USE_PCNFS
#undef USE_PCNFS
#endif

#include "rcs_defs.hh"		/* _Windows, EXTERN_C_STD_HEADERS */


#ifdef EXTERN_C_STD_HEADERS
extern "C"
{
#endif

#include <string.h>		/* strerror() */
#ifdef CenterLine
  char *strerror (int errnum);
#endif
#include <errno.h>		/* errno */

#ifndef VXWORKS
#include <fcntl.h>		/* fcntl(), O_NDELAY, F_SETFL */
#endif


#ifdef UNIX_LIKE_PLAT
#include <netinet/tcp.h>	// TCP_NODELAY
#endif

#ifdef VXWORKS
#include <netinet/tcp.h>	// TCP_NODELAY
#endif

#ifdef EXTERN_C_STD_HEADERS
}
#endif

#endif
//  STCPOPTS_NO_CONFIG_H


--- NEW FILE: ttyintf_no_config.h ---

#ifndef TTYINTF_NO_CONFIG_H
#define TTYINTF_NO_CONFIG_H

#include <stdio.h>
#include <stdlib.h>

#ifdef UNIX_LIKE_PLAT
#ifndef UNIX
#define UNIX 1
#endif
#endif

#ifdef UNIX
#include <errno.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <termios.h>
#endif

#ifdef WIN32
#include <windows.h>

#endif

#endif
// TTYINTF_NO_CONFIG_H

--- NEW FILE: udp_srv_no_config.h ---
#ifndef UDP_SRV_NO_CONFIG_H
#define UDP_SRV_NO_CONFIG_H

#include "rcs_defs.hh"		/* EXTERN_C_STD_HEADERS */

#ifdef EXTERN_C_STD_HEADERS
extern "C"
{
#endif

#include <errno.h>		// errno
#ifdef UNIX_LIKE_PLAT
#include <unistd.h>		// close(), getpid()
#endif
#include <string.h>		// memset()
#include <stdlib.h>		// exit()
#include <math.h>		// ceil

#ifdef VXWORKS
#include <vxWorks.h>
#include <taskLib.h>		// taskIdSelf()
#endif

#ifdef EXTERN_C_STD_HEADERS
}
#endif

#endif
// UDP_SRV_NO_CONFIG_H

--- NEW FILE: udpmem_no_config.h ---
#ifndef UDPMEM_NO_CONFIG_H
#define UDPMEM_NO_CONFIG_H

#ifdef USE_PCNFS
#undef USE_PCNFS
#endif


#include "rcs_defs.hh"		/* EXTERN_C_STD_HEADERS */


#ifdef EXTERN_C_STD_HEADERS
extern "C"
{
#endif

#include <stdlib.h>		/* strtod() */
#include <errno.h>		/* errno  */
#include <string.h>		// strstr, memset,
#include <math.h>		// ceil()
#include <ctype.h>		// isdigit()

#ifdef EXTERN_C_STD_HEADERS
}
#endif

#endif
//  UDPMEM_NO_CONFIG_H

[Emc-commit] rcslib/src/node nml_mod_no_config.h,NONE,1.1.2.1

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

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

Added Files:
      Tag: wps_multiplat_dev_branch
	nml_mod_no_config.h 
Log Message:
.

--- NEW FILE: nml_mod_no_config.h ---
#ifndef NML_MOD_NO_CONFIG_H
#define NML_MOD_NO_CONFIG_H

#ifdef EXTERN_C_STD_HEADERS
extern "C"
{
#endif

#include <stdlib.h>		// malloc()
#include <string.h>		// strcpy()
#include <errno.h>		// errno
#include <stdarg.h>
#include <math.h>		// fabs()

#ifdef EXTERN_C_STD_HEADERS
}
#endif

#endif
//  NML_MOD_NO_CONFIG_H

[Emc-commit] rcslib/src/cms cms.hh,4.40.2.1,4.40.2.2 cms_cfg.hh,4.33,4.33.2.1 cms_srv.cc,4.37.2.2,4.37.2.3 cms_srv.hh,4.35.2.1,4.35.2.2 cms_up.cc,4.36.2.1,4.36.2.2 cms_up.hh,4.34.2.1,4.34.2.2 cms_user.hh,4.33.2.1,4.33.2.2 cms_xup.cc,4.35.2.1,4.35.2.2 cms_xup.hh,4.34.2.1,4.34.2.2 cmsdiag.hh,4.32,4.32.2.1 filemem.cc,4.34,4.34.2.1 filemem.hh,4.33,4.33.2.1 nml.hh,4.38.2.1,4.38.2.2 nml_srv.cc,4.35.2.1,4.35.2.2 nml_srv.hh,4.32,4.32.2.1 nmlmsg.hh,4.33.2.1,4.33.2.2 nmlqr.hh,4.32,4.32.2.1 nmltest.cc,4.37.2.1,4.37.2.2 physmem.cc,4.35,4.35.2.1 physmem.hh,4.33,4.33.2.1 recvline.c,4.38,4.38.2.1 rem_msg.hh,4.35,4.35.2.1 sokintrf.c,4.35.2.1,4.35.2.2 sokintrf.h,4.34.2.2,4.34.2.3 stcpmem.cc,4.34.2.1,4.34.2.2 stcpopts.cc,4.32,4.32.2.1 ttyintf.c,4.9.2.1,4.9.2.2 ttyintf.h,4.2,4.2.2.1 udp_srv.cc,4.39,4.39.2.1 udp_srv.hh,4.33.2.1,4.33.2.2 udpmem.cc,4.37,4.37.2.1 udpmem.hh,4.33,4.33.2.1

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

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

Modified Files:
      Tag: wps_multiplat_dev_branch
	cms.hh cms_cfg.hh cms_srv.cc cms_srv.hh cms_up.cc cms_up.hh 
	cms_user.hh cms_xup.cc cms_xup.hh cmsdiag.hh filemem.cc 
	filemem.hh nml.hh nml_srv.cc nml_srv.hh nmlmsg.hh nmlqr.hh 
	nmltest.cc physmem.cc physmem.hh recvline.c rem_msg.hh 
	sokintrf.c sokintrf.h stcpmem.cc stcpopts.cc ttyintf.c 
	ttyintf.h udp_srv.cc udp_srv.hh udpmem.cc udpmem.hh 
Log Message:
.

Index: cms.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/cms.hh,v
retrieving revision 4.40.2.1
retrieving revision 4.40.2.2
diff -C2 -d -r4.40.2.1 -r4.40.2.2
*** cms.hh	8 Aug 2003 14:21:07 -0000	4.40.2.1
--- cms.hh	22 Aug 2003 20:06:36 -0000	4.40.2.2
***************
*** 15,20 ****
  #define CMS_HH
  
- #include "rcs_defs.hh"		/* RCS_EXPORT, EXTERN_C_STD_HEADERS */
- 
  /* Include Files */
  #ifdef EXTERN_C_STD_HEADERS
--- 15,18 ----
***************
*** 181,185 ****
  /* This structure will be placed at the beginning of every */
   /* CMS buffer. */
! struct RCS_EXPORT CMS_HEADER
  {
    long was_read;		/* Has the buffer been read since */
--- 179,183 ----
  /* This structure will be placed at the beginning of every */
   /* CMS buffer. */
! struct  CMS_HEADER
  {
    long was_read;		/* Has the buffer been read since */
***************
*** 189,197 ****
  };
  
! class RCS_EXPORT CMS_DIAG_PROC_INFO;
! class RCS_EXPORT CMS_DIAG_HEADER;
! class RCS_EXPORT CMS_DIAGNOSTICS_INFO;
  
! struct RCS_EXPORT CMS_QUEUING_HEADER
  {
    long head;
--- 187,195 ----
  };
  
! class  CMS_DIAG_PROC_INFO;
! class  CMS_DIAG_HEADER;
! class  CMS_DIAGNOSTICS_INFO;
  
! struct  CMS_QUEUING_HEADER
  {
    long head;
***************
*** 227,232 ****
  
  /* CMS class declaration. */
! class RCS_EXPORT CMS;
! class RCS_EXPORT CMS_UPDATER;
  
  typedef void (*transfer_from_function_ptr) (CMS *, void *from,
--- 225,230 ----
  
  /* CMS class declaration. */
! class  CMS;
! class  CMS_UPDATER;
  
  typedef void (*transfer_from_function_ptr) (CMS *, void *from,
***************
*** 256,260 ****
  
  /* CMS class definition. */
! class RCS_EXPORT CMS
  {
  public:
--- 254,258 ----
  
  /* CMS class definition. */
! class CMS
  {
  public:
***************
*** 748,756 ****
    long total_messages_missed;
    long messages_missed_on_last_read;
!   char RCS_HUGE *format_low_ptr;
!   char RCS_HUGE *format_high_ptr;
    long format_size;
!   int check_pointer (char RCS_HUGE * ptr, long bytes);
!   int check_pointer_with_name (const char *, char RCS_HUGE * ptr, long bytes);
    int isserver;			/* Is the process a server. */
    int is_phantom;		/* Is this a phantom CMS channel? */
--- 746,754 ----
    long total_messages_missed;
    long messages_missed_on_last_read;
!   char *format_low_ptr;
!   char *format_high_ptr;
    long format_size;
!   int check_pointer (char * ptr, long bytes);
!   int check_pointer_with_name (const char *, char * ptr, long bytes);
    int isserver;			/* Is the process a server. */
    int is_phantom;		/* Is this a phantom CMS channel? */

Index: cms_cfg.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/cms_cfg.hh,v
retrieving revision 4.33
retrieving revision 4.33.2.1
diff -C2 -d -r4.33 -r4.33.2.1
*** cms_cfg.hh	6 Sep 2001 14:32:54 -0000	4.33
--- cms_cfg.hh	22 Aug 2003 20:06:36 -0000	4.33.2.1
***************
*** 14,18 ****
  
  #include "cms_user.hh"
- #include "rcs_defs.hh"		/* RCS_EXPORT */
  
  /* Config File Definitions. */
--- 14,17 ----
***************
*** 30,38 ****
  
  /* Function Prototypes. */
!   extern int RCS_EXPORT cms_config (CMS ** c, char *b, char *p, char *f,
  				    int set_to_server = 0, int set_to_master =
  				    0);
  
!   extern int RCS_EXPORT cms_copy (CMS ** dest, CMS * src,
  				  int set_to_server = 0, int set_to_master =
  				  0);
--- 29,37 ----
  
  /* Function Prototypes. */
!   extern int cms_config (CMS ** c, char *b, char *p, char *f,
  				    int set_to_server = 0, int set_to_master =
  				    0);
  
!   extern int cms_copy (CMS ** dest, CMS * src,
  				  int set_to_server = 0, int set_to_master =
  				  0);

Index: cms_srv.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/cms_srv.cc,v
retrieving revision 4.37.2.2
retrieving revision 4.37.2.3
diff -C2 -d -r4.37.2.2 -r4.37.2.3
*** cms_srv.cc	22 Aug 2003 03:34:27 -0000	4.37.2.2
--- cms_srv.cc	22 Aug 2003 20:06:36 -0000	4.37.2.3
***************
*** 70,73 ****
--- 70,90 ----
  #endif
  
+ #include "cms_clnt_info.hh"
+ 
+ CMS_MSG_INFO::CMS_MSG_INFO()
+ {
+   addr = 0;
+   size = 0;
+   deleteaddr = 0;
+ }
+ 
+ CMS_MSG_INFO::~CMS_MSG_INFO()
+ {
+   if (addr && size && deleteaddr)
+     {
+       DEBUG_FREE (addr);
+     }
+   addr = 0;
+ }
  
  int cms_server_count = 0;

Index: cms_srv.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/cms_srv.hh,v
retrieving revision 4.35.2.1
retrieving revision 4.35.2.2
diff -C2 -d -r4.35.2.1 -r4.35.2.2
*** cms_srv.hh	8 Aug 2003 14:21:08 -0000	4.35.2.1
--- cms_srv.hh	22 Aug 2003 20:06:36 -0000	4.35.2.2
***************
*** 12,16 ****
  #define CMS_SERVER_HH
  
- #include "rcs_defs.hh"		/* EXTERN_C_STD_HEADERS  */
  #include "cms_user.hh"		/* class CMS, CMS_STATUS */
  #include "cms_cfg.hh"		/* CMS_CONFIG_LINELEN */
--- 12,15 ----
***************
*** 48,86 ****
  #endif
  
! class RCS_EXPORT CMS_SERVER;
! class RCS_EXPORT CMS_DIAG_PROC_INFO;
  
  class CMS_USER_INFO;
  
! class CMS_MSG_INFO
! {
! public:
!   CMS_MSG_INFO ()
!   {
!     addr = 0;
!     size = 0;
!     deleteaddr = 0;
!   };
!   ~CMS_MSG_INFO ()
!   {
!     if (addr && size && deleteaddr)
!       {
! 	DEBUG_FREE (addr);
!       }
!     addr = 0;
!   };
!   void *addr;
!   size_t size;
!   int deleteaddr;
! };
! 
! class CMS_CLIENT_INFO
! {
! public:
!   REMOTE_CLIENT_ID id;
!   CMS_MSG_INFO last_message_info;
! };
  
! class RCS_EXPORT CMS_SERVER_LOCAL_PORT:public virtual CMS_USER
  {
  public:
--- 47,58 ----
  #endif
  
! class CMS_SERVER;
! class CMS_DIAG_PROC_INFO;
  
  class CMS_USER_INFO;
  
! class CMS_CLIENT_INFO;
  
! class CMS_SERVER_LOCAL_PORT:public virtual CMS_USER
  {
  public:
***************
*** 133,137 ****
  
  
! class RCS_EXPORT CMS_SERVER_REMOTE_PORT
  {
  public:
--- 105,109 ----
  
  
! class CMS_SERVER_REMOTE_PORT
  {
  public:
***************
*** 166,170 ****
  
  
! class RCS_EXPORT CMS_SERVER
  {
  public:
--- 138,142 ----
  
  
! class CMS_SERVER
  {
  public:

Index: cms_up.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/cms_up.cc,v
retrieving revision 4.36.2.1
retrieving revision 4.36.2.2
diff -C2 -d -r4.36.2.1 -r4.36.2.2
*** cms_up.cc	8 Aug 2003 14:21:08 -0000	4.36.2.1
--- cms_up.cc	22 Aug 2003 20:06:36 -0000	4.36.2.2
***************
*** 270,274 ****
  
  int
! CMS_UPDATER::check_pointer (char RCS_HUGE * _pointer, long _bytes)
  {
    if (pointer_check_disabled > 0)
--- 270,274 ----
  
  int
! CMS_UPDATER::check_pointer (char * _pointer, long _bytes)
  {
    if (pointer_check_disabled > 0)
***************
*** 284,288 ****
  int
  CMS_UPDATER::check_pointer_with_name (const char *name,
! 				      char RCS_HUGE * _pointer, long _bytes)
  {
    if (pointer_check_disabled > 0)
--- 284,288 ----
  int
  CMS_UPDATER::check_pointer_with_name (const char *name,
! 				      char * _pointer, long _bytes)
  {
    if (pointer_check_disabled > 0)

Index: cms_up.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/cms_up.hh,v
retrieving revision 4.34.2.1
retrieving revision 4.34.2.2
diff -C2 -d -r4.34.2.1 -r4.34.2.2
*** cms_up.hh	8 Aug 2003 14:21:08 -0000	4.34.2.1
--- cms_up.hh	22 Aug 2003 20:06:36 -0000	4.34.2.2
***************
*** 31,35 ****
  
  /* Abstract CMS_UPDATER CLASS */
! class RCS_EXPORT CMS_UPDATER
  {
  public:
--- 31,35 ----
  
  /* Abstract CMS_UPDATER CLASS */
! class CMS_UPDATER
  {
  public:
***************
*** 385,391 ****
    virtual void recheck_properties(void);
  
!   virtual int check_pointer (char RCS_HUGE * ptr, long bytes);
!   virtual int check_pointer_with_name (const char *name, char RCS_HUGE * ptr,
! 				       long bytes);
    CMS_UPDATER_MODE mode;
    CMS *cms_parent;
--- 385,390 ----
    virtual void recheck_properties(void);
  
!   virtual int check_pointer (char * ptr, long bytes);
!   virtual int check_pointer_with_name (const char *name, char * ptr,long bytes);
    CMS_UPDATER_MODE mode;
    CMS *cms_parent;
***************
*** 411,415 ****
  
    /* Friends */
!   friend class RCS_EXPORT CMS;
  };
  
--- 410,414 ----
  
    /* Friends */
!   friend class CMS;
  };
  

Index: cms_user.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/cms_user.hh,v
retrieving revision 4.33.2.1
retrieving revision 4.33.2.2
diff -C2 -d -r4.33.2.1 -r4.33.2.2
*** cms_user.hh	8 Aug 2003 14:21:08 -0000	4.33.2.1
--- cms_user.hh	22 Aug 2003 20:06:36 -0000	4.33.2.2
***************
*** 2,13 ****
  #define CMS_USER_HH
  
- #include "rcs_defs.hh"
  
! #include <stdlib.h>
  
  
! class RCS_EXPORT CMS;
  
! class RCS_EXPORT CMS_USER
  {
  public:
--- 2,12 ----
  #define CMS_USER_HH
  
  
! #include <stdlib.h>		// size_t
  
  
! class CMS;
  
! class CMS_USER
  {
  public:

Index: cms_xup.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/cms_xup.cc,v
retrieving revision 4.35.2.1
retrieving revision 4.35.2.2
diff -C2 -d -r4.35.2.1 -r4.35.2.2
*** cms_xup.cc	21 Aug 2003 20:24:14 -0000	4.35.2.1
--- cms_xup.cc	22 Aug 2003 20:06:36 -0000	4.35.2.2
***************
*** 375,379 ****
  
  int
! CMS_XDR_UPDATER::check_pointer (char RCS_HUGE * _pointer, long _bytes)
  {
    if (NULL == cms_parent || NULL == current_stream)
--- 375,379 ----
  
  int
! CMS_XDR_UPDATER::check_pointer (char * _pointer, long _bytes)
  {
    if (NULL == cms_parent || NULL == current_stream)
***************
*** 437,441 ****
  {
    /* Check to see if the pointers are in the proper range. */
!   if (-1 == check_pointer ((char RCS_HUGE *) &x, sizeof (char)))
      {
        return (CMS_UPDATE_ERROR);
--- 437,441 ----
  {
    /* Check to see if the pointers are in the proper range. */
!   if (-1 == check_pointer ((char *) &x, sizeof (char)))
      {
        return (CMS_UPDATE_ERROR);
***************
*** 452,456 ****
  {
    /* Check to see if the pointers are in the proper range. */
!   if (-1 == check_pointer ((char RCS_HUGE *) x, len * sizeof (char)))
      {
        return (CMS_UPDATE_ERROR);
--- 452,456 ----
  {
    /* Check to see if the pointers are in the proper range. */
!   if (-1 == check_pointer ((char *) x, len * sizeof (char)))
      {
        return (CMS_UPDATE_ERROR);
***************
*** 468,472 ****
  {
    /* Check to see if the pointers are in the proper range. */
!   if (-1 == check_pointer ((char RCS_HUGE *) &x, sizeof (char)))
      {
        return (CMS_UPDATE_ERROR);
--- 468,472 ----
  {
    /* Check to see if the pointers are in the proper range. */
!   if (-1 == check_pointer ((char *) &x, sizeof (char)))
      {
        return (CMS_UPDATE_ERROR);
***************
*** 483,487 ****
  {
    /* Check to see if the pointers are in the proper range. */
!   if (-1 == check_pointer ((char RCS_HUGE *) x, len * sizeof (unsigned char)))
      {
        return (CMS_UPDATE_ERROR);
--- 483,487 ----
  {
    /* Check to see if the pointers are in the proper range. */
!   if (-1 == check_pointer ((char *) x, len * sizeof (unsigned char)))
      {
        return (CMS_UPDATE_ERROR);
***************
*** 501,505 ****
  {
    /* Check to see if the pointers are in the proper range. */
!   if (-1 == check_pointer ((char RCS_HUGE *) &x, sizeof (short)))
      {
        return (CMS_UPDATE_ERROR);
--- 501,505 ----
  {
    /* Check to see if the pointers are in the proper range. */
!   if (-1 == check_pointer ((char *) &x, sizeof (short)))
      {
        return (CMS_UPDATE_ERROR);
***************
*** 517,521 ****
  {
    /* Check to see if the pointers are in the proper range. */
!   if (-1 == check_pointer ((char RCS_HUGE *) x, len * sizeof (short)))
      {
        return (CMS_UPDATE_ERROR);
--- 517,521 ----
  {
    /* Check to see if the pointers are in the proper range. */
!   if (-1 == check_pointer ((char *) x, len * sizeof (short)))
      {
        return (CMS_UPDATE_ERROR);
***************
*** 534,538 ****
  CMS_STATUS CMS_XDR_UPDATER::update (unsigned short &x)
  {
!   if (-1 == check_pointer ((char RCS_HUGE *) &x, sizeof (unsigned short)))
      {
        return (CMS_UPDATE_ERROR);
--- 534,538 ----
  CMS_STATUS CMS_XDR_UPDATER::update (unsigned short &x)
  {
!   if (-1 == check_pointer ((char *) &x, sizeof (unsigned short)))
      {
        return (CMS_UPDATE_ERROR);
***************
*** 551,555 ****
  {
    if (-1 ==
!       check_pointer ((char RCS_HUGE *) x, len * sizeof (unsigned short)))
      {
        return (CMS_UPDATE_ERROR);
--- 551,555 ----
  {
    if (-1 ==
!       check_pointer ((char *) x, len * sizeof (unsigned short)))
      {
        return (CMS_UPDATE_ERROR);
***************
*** 571,575 ****
  CMS_STATUS CMS_XDR_UPDATER::update (int &x)
  {
!   if (-1 == check_pointer ((char RCS_HUGE *) &x, sizeof (int)))
      {
        return (CMS_UPDATE_ERROR);
--- 571,575 ----
  CMS_STATUS CMS_XDR_UPDATER::update (int &x)
  {
!   if (-1 == check_pointer ((char *) &x, sizeof (int)))
      {
        return (CMS_UPDATE_ERROR);
***************
*** 586,590 ****
  CMS_STATUS CMS_XDR_UPDATER::update (int *x, unsigned int len)
  {
!   if (-1 == check_pointer ((char RCS_HUGE *) x, len * sizeof (int)))
      {
        return (CMS_UPDATE_ERROR);
--- 586,590 ----
  CMS_STATUS CMS_XDR_UPDATER::update (int *x, unsigned int len)
  {
!   if (-1 == check_pointer ((char *) x, len * sizeof (int)))
      {
        return (CMS_UPDATE_ERROR);
***************
*** 601,605 ****
  CMS_STATUS CMS_XDR_UPDATER::update (unsigned int &x)
  {
!   if (-1 == check_pointer ((char RCS_HUGE *) &x, sizeof (unsigned int)))
      {
        return (CMS_UPDATE_ERROR);
--- 601,605 ----
  CMS_STATUS CMS_XDR_UPDATER::update (unsigned int &x)
  {
!   if (-1 == check_pointer ((char *) &x, sizeof (unsigned int)))
      {
        return (CMS_UPDATE_ERROR);
***************
*** 616,620 ****
  CMS_STATUS CMS_XDR_UPDATER::update (unsigned int *x, unsigned int len)
  {
!   if (-1 == check_pointer ((char RCS_HUGE *) x, len * sizeof (unsigned int)))
      {
        return (CMS_UPDATE_ERROR);
--- 616,620 ----
  CMS_STATUS CMS_XDR_UPDATER::update (unsigned int *x, unsigned int len)
  {
!   if (-1 == check_pointer ((char *) x, len * sizeof (unsigned int)))
      {
        return (CMS_UPDATE_ERROR);
***************
*** 637,641 ****
  CMS_STATUS CMS_XDR_UPDATER::update (long &x)
  {
!   if (-1 == check_pointer ((char RCS_HUGE *) &x, sizeof (long)))
      {
        return (CMS_UPDATE_ERROR);
--- 637,641 ----
  CMS_STATUS CMS_XDR_UPDATER::update (long &x)
  {
!   if (-1 == check_pointer ((char *) &x, sizeof (long)))
      {
        return (CMS_UPDATE_ERROR);
***************
*** 652,656 ****
  CMS_STATUS CMS_XDR_UPDATER::update (long *x, unsigned int len)
  {
!   if (-1 == check_pointer ((char RCS_HUGE *) x, len * sizeof (long)))
      {
        return (CMS_UPDATE_ERROR);
--- 652,656 ----
  CMS_STATUS CMS_XDR_UPDATER::update (long *x, unsigned int len)
  {
!   if (-1 == check_pointer ((char *) x, len * sizeof (long)))
      {
        return (CMS_UPDATE_ERROR);
***************
*** 668,672 ****
  CMS_STATUS CMS_XDR_UPDATER::update (unsigned long &x)
  {
!   if (-1 == check_pointer ((char RCS_HUGE *) &x, sizeof (unsigned long)))
      {
        return (CMS_UPDATE_ERROR);
--- 668,672 ----
  CMS_STATUS CMS_XDR_UPDATER::update (unsigned long &x)
  {
!   if (-1 == check_pointer ((char *) &x, sizeof (unsigned long)))
      {
        return (CMS_UPDATE_ERROR);
***************
*** 684,688 ****
  CMS_STATUS CMS_XDR_UPDATER::update (unsigned long *x, unsigned int len)
  {
!   if (-1 == check_pointer ((char RCS_HUGE *) x, len * sizeof (unsigned long)))
      {
        return (CMS_UPDATE_ERROR);
--- 684,688 ----
  CMS_STATUS CMS_XDR_UPDATER::update (unsigned long *x, unsigned int len)
  {
!   if (-1 == check_pointer ((char *) x, len * sizeof (unsigned long)))
      {
        return (CMS_UPDATE_ERROR);
***************
*** 704,708 ****
  CMS_STATUS CMS_XDR_UPDATER::update (float &x)
  {
!   if (-1 == check_pointer ((char RCS_HUGE *) &x, sizeof (float)))
      {
        return (CMS_UPDATE_ERROR);
--- 704,708 ----
  CMS_STATUS CMS_XDR_UPDATER::update (float &x)
  {
!   if (-1 == check_pointer ((char *) &x, sizeof (float)))
      {
        return (CMS_UPDATE_ERROR);
***************
*** 719,723 ****
  CMS_STATUS CMS_XDR_UPDATER::update (float *x, unsigned int len)
  {
!   if (-1 == check_pointer ((char RCS_HUGE *) x, len * sizeof (float)))
      {
        return (CMS_UPDATE_ERROR);
--- 719,723 ----
  CMS_STATUS CMS_XDR_UPDATER::update (float *x, unsigned int len)
  {
!   if (-1 == check_pointer ((char *) x, len * sizeof (float)))
      {
        return (CMS_UPDATE_ERROR);
***************
*** 736,740 ****
  CMS_STATUS CMS_XDR_UPDATER::update (double &x)
  {
!   if (-1 == check_pointer ((char RCS_HUGE *) &x, sizeof (double)))
      {
        return (CMS_UPDATE_ERROR);
--- 736,740 ----
  CMS_STATUS CMS_XDR_UPDATER::update (double &x)
  {
!   if (-1 == check_pointer ((char *) &x, sizeof (double)))
      {
        return (CMS_UPDATE_ERROR);
***************
*** 751,755 ****
  CMS_STATUS CMS_XDR_UPDATER::update (double *x, unsigned int len)
  {
!   if (-1 == check_pointer ((char RCS_HUGE *) x, len * sizeof (double)))
      {
        return (CMS_UPDATE_ERROR);
--- 751,755 ----
  CMS_STATUS CMS_XDR_UPDATER::update (double *x, unsigned int len)
  {
!   if (-1 == check_pointer ((char *) x, len * sizeof (double)))
      {
        return (CMS_UPDATE_ERROR);
***************
*** 773,777 ****
  CMS_STATUS CMS_XDR_UPDATER::update (long double &x)
  {
!   if (-1 == check_pointer ((char RCS_HUGE *) &x, sizeof (long double)))
      {
        return (CMS_UPDATE_ERROR);
--- 773,777 ----
  CMS_STATUS CMS_XDR_UPDATER::update (long double &x)
  {
!   if (-1 == check_pointer ((char *) &x, sizeof (long double)))
      {
        return (CMS_UPDATE_ERROR);
***************
*** 805,809 ****
  CMS_STATUS CMS_XDR_UPDATER::update (long double *x, unsigned int len)
  {
!   if (-1 == check_pointer ((char RCS_HUGE *) x, len * sizeof (long double)))
      {
        return (CMS_UPDATE_ERROR);
--- 805,809 ----
  CMS_STATUS CMS_XDR_UPDATER::update (long double *x, unsigned int len)
  {
!   if (-1 == check_pointer ((char *) x, len * sizeof (long double)))
      {
        return (CMS_UPDATE_ERROR);

Index: cms_xup.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/cms_xup.hh,v
retrieving revision 4.34.2.1
retrieving revision 4.34.2.2
diff -C2 -d -r4.34.2.1 -r4.34.2.2
*** cms_xup.hh	21 Aug 2003 20:24:14 -0000	4.34.2.1
--- cms_xup.hh	22 Aug 2003 20:06:36 -0000	4.34.2.2
***************
*** 36,40 ****
  
  protected:
!   int check_pointer (char RCS_HUGE *, long);
      CMS_XDR_UPDATER (CMS *);
      virtual ~ CMS_XDR_UPDATER ();
--- 36,40 ----
  
  protected:
!   int check_pointer (char *, long);
      CMS_XDR_UPDATER (CMS *);
      virtual ~ CMS_XDR_UPDATER ();

Index: cmsdiag.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/cmsdiag.hh,v
retrieving revision 4.32
retrieving revision 4.32.2.1
diff -C2 -d -r4.32 -r4.32.2.1
*** cmsdiag.hh	6 Sep 2001 14:32:54 -0000	4.32
--- cmsdiag.hh	22 Aug 2003 20:06:36 -0000	4.32.2.1
***************
*** 7,11 ****
  #include "linklist.hh"
  
! class RCS_EXPORT CMS_DIAG_STATIC_PROC_INFO
  {
  public:
--- 7,11 ----
  #include "linklist.hh"
  
! class CMS_DIAG_STATIC_PROC_INFO
  {
  public:
***************
*** 16,20 ****
  };
  
! class RCS_EXPORT CMS_DIAG_PROC_INFO:public CMS_DIAG_STATIC_PROC_INFO
  {
  public:
--- 16,20 ----
  };
  
! class CMS_DIAG_PROC_INFO:public CMS_DIAG_STATIC_PROC_INFO
  {
  public:
***************
*** 33,37 ****
  };
  
! class RCS_EXPORT CMS_DIAG_HEADER
  {
  public:
--- 33,37 ----
  };
  
! class CMS_DIAG_HEADER
  {
  public:
***************
*** 41,45 ****
  
  
! class RCS_EXPORT CMS_DIAGNOSTICS_INFO:public CMS_DIAG_HEADER
  {
  public:
--- 41,45 ----
  
  
! class CMS_DIAGNOSTICS_INFO:public CMS_DIAG_HEADER
  {
  public:

Index: filemem.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/filemem.cc,v
retrieving revision 4.34
retrieving revision 4.34.2.1
diff -C2 -d -r4.34 -r4.34.2.1
*** filemem.cc	6 May 2003 15:18:14 -0000	4.34
--- filemem.cc	22 Aug 2003 20:06:36 -0000	4.34.2.1
***************
*** 6,19 ****
  **********************************************************************/
  
! /*
!   Modification history:
! 
!   18-Oct-1996  FMP added fgetpos(), fsetpos() for LynxOS, since it doesn't
!   have it
!   ??? Will Shackleford created, but who knows when since he doesn't use
!   modification histories. Bad boy.
! */
  
- #include "rcs_defs.hh"		// EXTERN_C_STD_HEADERS
  #include "filemem.hh"		// class FILEMEM
  #include "cms.hh"		// class CMS
--- 6,15 ----
  **********************************************************************/
  
! #if HAVE_CONFIG_H
! #include "rcs_config_include.h"
! #else
! #include "filemem_no_config.h"
! #endif
  
  #include "filemem.hh"		// class FILEMEM
  #include "cms.hh"		// class CMS
***************
*** 21,90 ****
  #include "timer.hh"		// etime()
  
- 
- #ifdef HAVE_CONFIG_H
- #include "rcs_config_include.h"
- 
- #else
- 
- #ifdef EXTERN_C_STD_HEADERS
- extern "C"
- {
- #endif
- 
- #include <stdlib.h>		// malloc()
- #include <string.h>		// strcpy(), strcmp()
- #include <errno.h>		// errno
- 
- 
- #ifdef  USE_FCNTL_FILE_LOCKING
- #include <fcntl.h>
- #endif
- 
- #if defined(USE_FCNTL_FILE_LOCKING) && defined(FILEMEM_USE_SEMAPHORES)
- #error Can not compile with both defined(USE_FCNTL_FILE_LOCKING && FILEMEM_USE_SEMAPHORES)
- #endif
- 
- #if defined(lynxosPC) || defined(sunos4)
- 
- // no prototypes for these in LynxOS-- how lame. Let's do them here
- 
- #include <stdio.h>		/* ftell(), fpos_t */
- #include <unistd.h>		// SEEK_SET
- 
-   static int fgetpos (FILE * stream, fpos_t * ptr);
-   static int fsetpos (FILE * stream, const fpos_t * ptr);
- 
- // FIXME-- test these!
- 
-   int fgetpos (FILE * stream, fpos_t * ptr)
-   {
-     long retval;
- 
-       retval = ftell (stream);
- 
-     if (retval == -1L)
-       {
- 	return -1;
-       }
-     else
-       {
- 	*ptr = (fpos_t) retval;
- 	return 0;
-       }
-   }
- 
-   int fsetpos (FILE * stream, const fpos_t * ptr)
-   {
-     return fseek (stream, (long) *ptr, SEEK_SET);
-   }
- 
- #endif
- 
- #ifdef EXTERN_C_STD_HEADERS
- }
- #endif
- 
- #endif // HAVE_CONFIG_H
- 
  /* rw-rw-r-- permissions */
  #ifndef WIN32
--- 17,20 ----
***************
*** 103,106 ****
--- 33,55 ----
  #endif
  
+ class FILEMEM_NONPORT_INTERNALS
+ {
+   friend class FILEMEM;
+ 
+   fpos_t last_read_pos;
+   fpos_t last_write_pos;
+ #ifdef FILEMEM_USE_SEMAPHORES
+   key_t key;			/* key for sem */
+   RCS_SEMAPHORE *sem;		/* semaphore */
+ #endif
+ 
+ #ifdef USE_FCNTL_FILE_LOCKING
+   struct flock read_lock;
+   struct flock write_lock;
+   int input_fd;
+   int output_fd;
+ #endif
+ 
+ };
  
  FILEMEM::FILEMEM (char *bufline, char *procline, int set_to_server,
***************
*** 112,115 ****
--- 61,66 ----
    char *end_name = (char *) NULL;
  
+   internals = new FILEMEM_NONPORT_INTERNALS();
+ 
    int master;
    master = is_local_master;
***************
*** 148,152 ****
  #ifdef FILEMEM_USE_SEMAPHORES
    /* Save parameters from configuration file. */
!   if (sscanf (bufline, "%*s %*s %*s %*s %*d %*s %*s %*d %d", &key) != 1)
      {
        rcs_print_error ("FILEMEM: Invalid configuration file format.\n");
--- 99,103 ----
  #ifdef FILEMEM_USE_SEMAPHORES
    /* Save parameters from configuration file. */
!   if (sscanf (bufline, "%*s %*s %*s %*s %*d %*s %*s %*d %d", &internals->key) != 1)
      {
        rcs_print_error ("FILEMEM: Invalid configuration file format.\n");
***************
*** 250,255 ****
    if (is_local_master)
      {
!       sem = new RCS_SEMAPHORE (key, RCS_SEMAPHORE_CREATE, -1, (int) MODE, 1);
!       if (NULL == sem)
  	{
  	  rcs_print_error ("CMS: couldn't create RCS_SEMAPHORE.\n");
--- 201,206 ----
    if (is_local_master)
      {
!       internals->sem = new RCS_SEMAPHORE (internals->key, RCS_SEMAPHORE_CREATE, -1, (int) MODE, 1);
!       if (NULL == internals->sem)
  	{
  	  rcs_print_error ("CMS: couldn't create RCS_SEMAPHORE.\n");
***************
*** 258,262 ****
  	  return;
  	}
!       if (!sem->valid ())
  	{
  	  rcs_print_error ("CMS: RCS_SEMAPHORE is invalid.\n");
--- 209,213 ----
  	  return;
  	}
!       if (!internals->sem->valid ())
  	{
  	  rcs_print_error ("CMS: RCS_SEMAPHORE is invalid.\n");
***************
*** 267,272 ****
    else
      {
!       sem = new RCS_SEMAPHORE (key, RCS_SEMAPHORE_NOCREATE, -1);
!       if (NULL == sem)
  	{
  	  rcs_print_error ("CMS: couldn't create RCS_SEMAPHORE.\n");
--- 218,223 ----
    else
      {
!       internals->sem = new RCS_SEMAPHORE (internals->key, RCS_SEMAPHORE_NOCREATE, -1);
!       if (NULL == internals->sem)
  	{
  	  rcs_print_error ("CMS: couldn't create RCS_SEMAPHORE.\n");
***************
*** 275,279 ****
  	  return;
  	}
!       if (!sem->valid ())
  	{
  	  rcs_print_error ("CMS: RCS_SEMAPHORE is invalid.\n");
--- 226,230 ----
  	  return;
  	}
!       if (!internals->sem->valid ())
  	{
  	  rcs_print_error ("CMS: RCS_SEMAPHORE is invalid.\n");
***************
*** 286,291 ****
  
  
!   fgetpos (in, &last_read_pos);
!   fgetpos (out, &last_write_pos);
  
  }
--- 237,242 ----
  
  
!   fgetpos (in, &internals->last_read_pos);
!   fgetpos (out, &internals->last_write_pos);
  
  }
***************
*** 305,323 ****
      }
  #ifdef FILEMEM_USE_SEMAPHORES
!   if (NULL != sem)
      {
        if (is_local_master || delete_totally)
  	{
! 	  sem->setflag (RCS_SEMAPHORE_CREATE);
  	}
        else
  	{
! 	  sem->setflag (RCS_SEMAPHORE_NOCREATE);
  	}
!       delete sem;
!       sem = (RCS_SEMAPHORE *) NULL;
      }
  #endif
! 
  }
  
--- 256,278 ----
      }
  #ifdef FILEMEM_USE_SEMAPHORES
!   if (NULL != internals->sem)
      {
        if (is_local_master || delete_totally)
  	{
! 	  internals->sem->setflag (RCS_SEMAPHORE_CREATE);
  	}
        else
  	{
! 	  internals->sem->setflag (RCS_SEMAPHORE_NOCREATE);
  	}
!       delete internals->sem;
!       internals->sem = (RCS_SEMAPHORE *) NULL;
      }
  #endif
!   if(internals)
!     {
!       delete internals;
!       internals=0;
!     }
  }
  
***************
*** 362,366 ****
      {
        memset (input_buffer, 0, FILEMEM_INPUT_BUFFER_SIZE);
!       fgetpos (in, &last_read_pos);
        fgets (input_buffer, FILEMEM_INPUT_BUFFER_SIZE, in);
        if (!strncmp (input_buffer, "MSG", 3))
--- 317,321 ----
      {
        memset (input_buffer, 0, FILEMEM_INPUT_BUFFER_SIZE);
!       fgetpos (in, &internals->last_read_pos);
        fgets (input_buffer, FILEMEM_INPUT_BUFFER_SIZE, in);
        if (!strncmp (input_buffer, "MSG", 3))
***************
*** 423,427 ****
        if (!strncmp (input_buffer, "END", 3))
  	{
! 	  fsetpos (in, &last_read_pos);
  	  unlock_input ();
  	  close_input ();
--- 378,382 ----
        if (!strncmp (input_buffer, "END", 3))
  	{
! 	  fsetpos (in, &internals->last_read_pos);
  	  unlock_input ();
  	  close_input ();
***************
*** 443,463 ****
      }
  #ifdef FILEMEM_USE_SEMAPHORES
!   if (NULL == sem)
      {
        return -1;
      }
!   return sem->wait ();
  #endif
  
  
  #ifdef USE_FCNTL_FILE_LOCKING
!   input_fd = fileno (in);
!   read_lock.l_type = F_RDLCK;
!   read_lock.l_start = 0;
!   read_lock.l_whence = SEEK_SET;
!   read_lock.l_len = 0;
    while (1)
      {
!       switch (fcntl (input_fd, F_SETLK, &read_lock))
  	{
  	case -1:
--- 398,418 ----
      }
  #ifdef FILEMEM_USE_SEMAPHORES
!   if (NULL == internals->sem)
      {
        return -1;
      }
!   return internals->sem->wait ();
  #endif
  
  
  #ifdef USE_FCNTL_FILE_LOCKING
!   internals->input_fd = fileno (in);
!   internals->read_lock.l_type = F_RDLCK;
!   internals->read_lock.l_start = 0;
!   internals->read_lock.l_whence = SEEK_SET;
!   internals->read_lock.l_len = 0;
    while (1)
      {
!       switch (fcntl (internals->input_fd, F_SETLK, &internals->read_lock))
  	{
  	case -1:
***************
*** 486,496 ****
      }
  #ifdef FILEMEM_USE_SEMAPHORES
!   sem->post ();
    return 0;
  #endif
  
  #ifdef USE_FCNTL_FILE_LOCKING
!   read_lock.l_type = F_UNLCK;
!   fcntl (input_fd, F_SETLK, &read_lock);
  #endif
    return 0;
--- 441,451 ----
      }
  #ifdef FILEMEM_USE_SEMAPHORES
!   internals->sem->post ();
    return 0;
  #endif
  
  #ifdef USE_FCNTL_FILE_LOCKING
!   internals->read_lock.l_type = F_UNLCK;
!   fcntl (internals->input_fd, F_SETLK, &internals->read_lock);
  #endif
    return 0;
***************
*** 506,525 ****
  
  #ifdef FILEMEM_USE_SEMAPHORES
!   if (NULL == sem)
      {
        return -1;
      }
!   return sem->wait ();
  #endif
  
  #ifdef USE_FCNTL_FILE_LOCKING
!   output_fd = fileno (out);
!   write_lock.l_type = F_WRLCK;
!   write_lock.l_start = 0;
!   write_lock.l_whence = SEEK_SET;
!   write_lock.l_len = 0;
    while (1)
      {
!       switch (fcntl (output_fd, F_SETLK, &write_lock))
  	{
  	case -1:
--- 461,480 ----
  
  #ifdef FILEMEM_USE_SEMAPHORES
!   if (NULL == internals->sem)
      {
        return -1;
      }
!   return internals->sem->wait ();
  #endif
  
  #ifdef USE_FCNTL_FILE_LOCKING
!   internals->output_fd = fileno (out);
!   internals->write_lock.l_type = F_WRLCK;
!   internals->write_lock.l_start = 0;
!   internals->write_lock.l_whence = SEEK_SET;
!   internals->write_lock.l_len = 0;
    while (1)
      {
!       switch (fcntl (internals->output_fd, F_SETLK, &internals->write_lock))
  	{
  	case -1:
***************
*** 548,558 ****
      }
  #ifdef FILEMEM_USE_SEMAPHORES
!   sem->post ();
    return 0;
  #endif
  
  #ifdef USE_FCNTL_FILE_LOCKING
!   write_lock.l_type = F_UNLCK;
!   fcntl (output_fd, F_SETLK, &write_lock);
  #endif
    return 0;
--- 503,513 ----
      }
  #ifdef FILEMEM_USE_SEMAPHORES
!   internals->sem->post ();
    return 0;
  #endif
  
  #ifdef USE_FCNTL_FILE_LOCKING
!   internals->write_lock.l_type = F_UNLCK;
!   fcntl (internals->output_fd, F_SETLK, &internals->write_lock);
  #endif
    return 0;
***************
*** 582,586 ****
  	    {
  	      read_cycle = file_cycle;
! 	      fgetpos (in, &last_read_pos);
  	      return;
  	    }
--- 537,541 ----
  	    {
  	      read_cycle = file_cycle;
! 	      fgetpos (in, &internals->last_read_pos);
  	      return;
  	    }
***************
*** 618,622 ****
  		{
  		  read_cycle = file_cycle;
! 		  fgetpos (in, &last_read_pos);
  		  return;
  		}
--- 573,577 ----
  		{
  		  read_cycle = file_cycle;
! 		  fgetpos (in, &internals->last_read_pos);
  		  return;
  		}
***************
*** 649,653 ****
    write_time = etime ();
    write_count++;
!   fsetpos (out, &last_write_pos);
    if (write_count > max_output_messages &&
        max_output_messages > 0 && strcmp (outfile_name, "stdout") != 0)
--- 604,608 ----
    write_time = etime ();
    write_count++;
!   fsetpos (out, &internals->last_write_pos);
    if (write_count > max_output_messages &&
        max_output_messages > 0 && strcmp (outfile_name, "stdout") != 0)
***************
*** 698,702 ****
  	  return (status = CMS_MISC_ERROR);
  	}
!       fgetpos (out, &last_write_pos);
  
      }
--- 653,657 ----
  	  return (status = CMS_MISC_ERROR);
  	}
!       fgetpos (out, &internals->last_write_pos);
  
      }
***************
*** 730,734 ****
    last_write_time = write_time;
  
!   fgetpos (out, &last_write_pos);
    if (fprintf (out, "\nEND>\n#") < 0)
      {
--- 685,689 ----
    last_write_time = write_time;
  
!   fgetpos (out, &internals->last_write_pos);
    if (fprintf (out, "\nEND>\n#") < 0)
      {

Index: filemem.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/filemem.hh,v
retrieving revision 4.33
retrieving revision 4.33.2.1
diff -C2 -d -r4.33 -r4.33.2.1
*** filemem.hh	6 Sep 2001 14:32:54 -0000	4.33
--- filemem.hh	22 Aug 2003 20:06:36 -0000	4.33.2.1
***************
*** 9,66 ****
  #define FILEMEM_HH
  
  
- #if defined(VXWORKS) || defined(DOS_WINDOWS) || defined(lynxosPC)
- #ifdef USE_FCNTL_FILE_LOCKING
- #undef USE_FCNTL_FILE_LOCKING
- #endif
- #endif
- 
- #if !defined(USE_FCNTL_FILE_LOCKING) && !defined(MSDOS)
- #define FILEMEM_USE_SEMAPHORES
- #endif
- 
- #include "rcs_defs.hh"		// DOS_WINDOWS
  #include "cms.hh"		// class CMS
- #include <stdio.h>		// FILE *, fpos_t
- 
- #ifdef FILEMEM_USE_SEMAPHORES
- #include "sem.hh"		// class RCS_SEMAPHORE
- 
- #if  !defined(DOS_WINDOWS) && !defined(VXWORKS)
- #include <sys/types.h>		/* key_t */
- #include <sys/ipc.h>
- #include <sys/sem.h>
- #endif
- 
- #include <stddef.h>		/* size_t */
- 
- #ifndef KEY_T_DEFINED
- 
- #ifdef VXWORKS
- typedef int key_t;		/* key_t is not defined in VxWorks or  Windows -- do
- 				   it here, and it should be visible
- 				   throughout all the shared mem code */
- #endif
- 
- #ifdef WIN32
- typedef long key_t;
- #endif
- #endif
- 
- #endif
- 
  
  #define FILEMEM_INPUT_BUFFER_SIZE (2048)
  
  
! #ifdef USE_FCNTL_FILE_LOCKING
! #include <sys/fcntl.h>
! #endif
! 
! #ifdef sunos4
! // The sunos4 header files say that fgetpos and fsetpos take a pointer to a
! // a long even though ANSI says they should take an fpos_t.
! typedef long fpos_t;
! #endif
  
  class FILEMEM:public CMS
--- 9,20 ----
  #define FILEMEM_HH
  
+ #include <stdio.h>		// FILE
  
  #include "cms.hh"		// class CMS
  
  #define FILEMEM_INPUT_BUFFER_SIZE (2048)
  
  
! class FILEMEM_NONPORT_INTERNALS;
  
  class FILEMEM:public CMS
***************
*** 101,123 ****
    int read_cycle;
    int add_waits;
!   fpos_t last_read_pos;
!   fpos_t last_write_pos;
! #ifdef FILEMEM_USE_SEMAPHORES
!   key_t key;			/* key for sem */
!   RCS_SEMAPHORE *sem;		/* semaphore */
! #endif
    long write_file_length;
- #ifdef USE_FCNTL_FILE_LOCKING
-   struct flock read_lock;
-   struct flock write_lock;
-   int input_fd;
-   int output_fd;
- #endif
    int lock_input ();
    int lock_output ();
    int unlock_input ();
    int unlock_output ();
- 
- 
  };
  
--- 55,66 ----
    int read_cycle;
    int add_waits;
! 
!   class FILEMEM_NONPORT_INTERNALS *internals;
! 
    long write_file_length;
    int lock_input ();
    int lock_output ();
    int unlock_input ();
    int unlock_output ();
  };
  

Index: nml.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/nml.hh,v
retrieving revision 4.38.2.1
retrieving revision 4.38.2.2
diff -C2 -d -r4.38.2.1 -r4.38.2.2
*** nml.hh	8 Aug 2003 14:21:10 -0000	4.38.2.1
--- nml.hh	22 Aug 2003 20:06:36 -0000	4.38.2.2
***************
*** 14,19 ****
  
  /* Include Files */
- #include "rcs_defs.hh"		/* EXTERN_C_STD_HEADERS */
- 
  
  #ifdef EXTERN_C_STD_HEADERS
--- 14,17 ----
***************
*** 39,43 ****
  #endif
  
! class RCS_EXPORT NMLmsg;	/* Use only partial definition to avoid */
  				/* depending on nmlmsg.hh. */
  
--- 37,41 ----
  #endif
  
! class NMLmsg;	/* Use only partial definition to avoid */
  				/* depending on nmlmsg.hh. */
  
***************
*** 46,50 ****
  /* Typedef for pointer to the function used to decode a message */
   /* by its id number. */
! typedef int (*NML_FORMAT_PTR) (NMLTYPE, void RCS_FAR *, CMS RCS_FAR *);
  
  /* Values for NML::error_type. */
--- 44,48 ----
  /* Typedef for pointer to the function used to decode a message */
   /* by its id number. */
! typedef int (*NML_FORMAT_PTR) (NMLTYPE, void *, CMS *);
  
  /* Values for NML::error_type. */
***************
*** 79,83 ****
  
  /* nml interface to CMS. */
! class RCS_EXPORT NML:public virtual CMS_USER
  {
  protected:
--- 77,81 ----
  
  /* nml interface to CMS. */
! class NML:public virtual CMS_USER
  {
  protected:
***************
*** 98,103 ****
    int pid;
  #ifdef _Windows
!   // HANDLE replaced with void RCS_FAR *
!   void RCS_FAR *task_handle;
  #endif
    /* Get Address of message for user after read. */
--- 96,101 ----
    int pid;
  #ifdef _Windows
!   // HANDLE replaced with void *
!   void *task_handle;
  #endif
    /* Get Address of message for user after read. */
***************
*** 249,267 ****
  
  
! int RCS_EXPORT create_NML (NML **, NML_FORMAT_PTR f_ptr,
  			   char *buf, char *proc, char *file);
  
! void RCS_EXPORT free_NML (NML *);
  
  
! extern RCS_LINKED_LIST RCS_FAR *NML_Main_Channel_List;
  extern "C"
  {
!   extern void RCS_EXPORT nml_start ();
!   extern void RCS_EXPORT nml_cleanup ();
!   extern void RCS_EXPORT nml_wipeout_lists ();
!   extern void RCS_EXPORT set_default_nml_config_file (const char RCS_FAR *);
!   extern const char *RCS_EXPORT get_default_nml_config_file ();
!   extern NML *RCS_EXPORT nmlWaitOpen (NML_FORMAT_PTR fPtr, char *buffer,
  				      char *name, char *file,
  				      double sleepTime);
--- 247,266 ----
  
  
! int create_NML (NML **, NML_FORMAT_PTR f_ptr,
  			   char *buf, char *proc, char *file);
  
! void free_NML (NML *);
  
  
! extern RCS_LINKED_LIST *NML_Main_Channel_List;
! 
  extern "C"
  {
!   extern void nml_start ();
!   extern void nml_cleanup ();
!   extern void nml_wipeout_lists ();
!   extern void set_default_nml_config_file (const char *);
!   extern const char *get_default_nml_config_file ();
!   extern NML *nmlWaitOpen (NML_FORMAT_PTR fPtr, char *buffer,
  				      char *name, char *file,
  				      double sleepTime);

Index: nml_srv.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/nml_srv.cc,v
retrieving revision 4.35.2.1
retrieving revision 4.35.2.2
diff -C2 -d -r4.35.2.1 -r4.35.2.2
*** nml_srv.cc	8 Aug 2003 14:21:10 -0000	4.35.2.1
--- nml_srv.cc	22 Aug 2003 20:06:36 -0000	4.35.2.2
***************
*** 8,41 ****
  *************************************************************************/
  
! #include "rcs_defs.hh"		/* EXTERN_C_STD_HEADERS  */
! 
! #ifdef EXTERN_C_STD_HEADERS
! extern "C"
! {
! #endif
! 
! #include <string.h>		/* memcpy() */
! 
! #if defined(WIN32) && !defined(gnuwin32)
! #if defined(WIN32) && !defined(USE_OLD_WINSOCK)
! // Lame problem if windows.h is included before winsock2.h many redefined
! // compiler errors result.
! #include <winsock2.h>
! #endif
  
- #include <windows.h>		/* GetCurrentProcessId(), GetCurrentThreadID() */
  #else
! #include <signal.h>		/* kill() */
! #include <sys/types.h>
! #include <unistd.h>		/* getpid() */
! #include <sys/wait.h>		/* waitpid() */
! #include <stdlib.h>		/* atexit() */
! #ifdef VXWORKS
! #include <taskLib.h>		/* taskIdSelf() */
! #endif
! #endif
! 
! #ifdef EXTERN_C_STD_HEADERS
! }
  #endif
  
--- 8,16 ----
  *************************************************************************/
  
! #if HAVE_CONFIG_H
! #include "rcs_config_include.h"
  
  #else
! #include "nml_srv_no_config.h"
  #endif
  
***************
*** 51,54 ****
--- 26,31 ----
  #include "timer.hh"		// esleep()
  #include "dbg_mem.h"		// DEBUG_MALLOC, DEBUG_FREE
+ 
+ #include "cms_clnt_info.hh" // class CMS_CLIENT_INFO
  
  #ifdef CMS_USE_DIAG

Index: nml_srv.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/nml_srv.hh,v
retrieving revision 4.32
retrieving revision 4.32.2.1
diff -C2 -d -r4.32 -r4.32.2.1
*** nml_srv.hh	6 Sep 2001 14:32:55 -0000	4.32
--- nml_srv.hh	22 Aug 2003 20:06:37 -0000	4.32.2.1
***************
*** 11,42 ****
  #define NML_SERVER_HH
  
- #include "rcs_defs.hh"		/* EXTERN_C_STD_HEADERS  */
- 
- #ifdef EXTERN_C_STD_HEADERS
- extern "C"
- {
- #endif
- 
- #ifdef WIN32
- 
- #if defined(WIN32) && !defined(USE_OLD_WINSOCK)
-   /* Lame problem if windows.h is included before winsock2.h many redefined
-      compiler errors result. */
- #include <winsock2.h>
- #endif
- 
- #include <windows.h>
- #else
- 
- #ifndef VXWORKS
- #include <sys/types.h>
- #include <unistd.h>		/* pid_t */
- #endif
- #endif
- 
- #ifdef EXTERN_C_STD_HEADERS
- }
- #endif
- 
  #include "cms_srv.hh"		/* class CMS_SERVER */
  #include "nml.hh"		/* class NML */
--- 11,14 ----
***************
*** 45,49 ****
  
  /* Server class */
! class RCS_EXPORT NML_SERVER_LOCAL_PORT:public CMS_SERVER_LOCAL_PORT
  {
  protected:
--- 17,21 ----
  
  /* Server class */
! class NML_SERVER_LOCAL_PORT:public CMS_SERVER_LOCAL_PORT
  {
  protected:
***************
*** 69,73 ****
  };
  
! class RCS_EXPORT NML_SERVER:public CMS_SERVER
  {
  protected:
--- 41,45 ----
  };
  
! class NML_SERVER:public CMS_SERVER
  {
  protected:
***************
*** 83,87 ****
  };
  
! class RCS_EXPORT NML_SUPER_SERVER
  {
  public:
--- 55,59 ----
  };
  
! class NML_SUPER_SERVER
  {
  public:
***************
*** 97,107 ****
  };
  
! extern RCS_EXPORT NML_SUPER_SERVER *NML_Default_Super_Server;
! extern void RCS_EXPORT run_nml_servers ();
! extern void RCS_EXPORT spawn_nml_servers ();
! extern void RCS_EXPORT kill_nml_servers ();
  extern "C"
  {
!   extern void RCS_EXPORT nml_server_cleanup ();
  }
  
--- 69,79 ----
  };
  
! extern NML_SUPER_SERVER *NML_Default_Super_Server;
! extern void run_nml_servers ();
! extern void spawn_nml_servers ();
! extern void kill_nml_servers ();
  extern "C"
  {
!   extern void nml_server_cleanup ();
  }
  

Index: nmlmsg.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/nmlmsg.hh,v
retrieving revision 4.33.2.1
retrieving revision 4.33.2.2
diff -C2 -d -r4.33.2.1 -r4.33.2.2
*** nmlmsg.hh	8 Aug 2003 14:21:10 -0000	4.33.2.1
--- nmlmsg.hh	22 Aug 2003 20:06:37 -0000	4.33.2.2
***************
*** 11,16 ****
  #define NMLMSG_HH
  
- #include "rcs_defs.hh"		/* RCS_EXPORT */
- 
  /* Include Files */
  #ifdef EXTERN_C_STD_HEADERS
--- 11,14 ----
***************
*** 26,30 ****
  /* Definitions from other Header files. */
  
! class RCS_EXPORT CMS;		/* Use only partial definition to avoid */
  				/* depending on cms.hh */
  
--- 24,28 ----
  /* Definitions from other Header files. */
  
! class CMS;		/* Use only partial definition to avoid */
  				/* depending on cms.hh */
  
***************
*** 42,46 ****
  /* Derived classes should pass the type and size to the NMLmsg constructor. */
  /*  and define their own update function. */
! class RCS_EXPORT NMLmsg
  {
  protected:
--- 40,44 ----
  /* Derived classes should pass the type and size to the NMLmsg constructor. */
  /*  and define their own update function. */
! class NMLmsg
  {
  protected:

Index: nmlqr.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/nmlqr.hh,v
retrieving revision 4.32
retrieving revision 4.32.2.1
diff -C2 -d -r4.32 -r4.32.2.1
*** nmlqr.hh	6 Sep 2001 14:32:55 -0000	4.32
--- nmlqr.hh	22 Aug 2003 20:06:37 -0000	4.32.2.1
***************
*** 4,8 ****
  #define NMLQR_HH
  
- #include "rcs_defs.hh"
  #include "nml.hh"
  #include "nmlmsg.hh"
--- 4,7 ----
***************
*** 18,22 ****
  };
  
! class RCS_EXPORT NML_QUERY_CHANNEL:public NML
  {
  public:
--- 17,21 ----
  };
  
! class NML_QUERY_CHANNEL:public NML
  {
  public:
***************
*** 30,34 ****
  };
  
! class RCS_EXPORT NML_ID_CHANNEL:public NML
  {
  public:
--- 29,33 ----
  };
  
! class NML_ID_CHANNEL:public NML
  {
  public:

Index: nmltest.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/nmltest.cc,v
retrieving revision 4.37.2.1
retrieving revision 4.37.2.2
diff -C2 -d -r4.37.2.1 -r4.37.2.2
*** nmltest.cc	8 Aug 2003 14:21:10 -0000	4.37.2.1
--- nmltest.cc	22 Aug 2003 20:06:37 -0000	4.37.2.2
***************
*** 9,12 ****
--- 9,13 ----
  
  #include "rcs.hh"
+ #include "inetfile.hh"
  
  #ifdef CMS_USE_DIAG

Index: physmem.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/physmem.cc,v
retrieving revision 4.35
retrieving revision 4.35.2.1
diff -C2 -d -r4.35 -r4.35.2.1
*** physmem.cc	6 May 2003 15:18:15 -0000	4.35
--- physmem.cc	22 Aug 2003 20:06:37 -0000	4.35.2.1
***************
*** 12,64 ****
  ***********************************************************************/
  
! #include "rcs_defs.hh"		/* __MSDOS__, RCS_FAR, EXTERN_C_STD_HEADERS  */
! #include "dbg_mem.h"		// DEBUG_MALLOC, DEBUG_FREE
  
! #ifdef EXTERN_C_STD_HEADERS
! extern "C"
! {
  #endif
  
[...999 lines suppressed...]
  
  int
! PHYSMEM_HANDLE::write_byte_to_genport (BYTE data, ULONG PortNumber)
  {
    // The following is returned by IOCTL.  It is true if the read succeeds.
--- 1048,1052 ----
  
  int
! PHYSMEM_INTERNALS::write_byte_to_genport (BYTE data, ULONG PortNumber)
  {
    // The following is returned by IOCTL.  It is true if the read succeeds.
***************
*** 1018,1019 ****
--- 1083,1088 ----
  
  #endif
+ // USE_GENPORT
+ 
+ #endif
+ // WIN32 && !gnuwin32

Index: physmem.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/physmem.hh,v
retrieving revision 4.33
retrieving revision 4.33.2.1
diff -C2 -d -r4.33 -r4.33.2.1
*** physmem.hh	6 May 2003 15:18:15 -0000	4.33
--- physmem.hh	22 Aug 2003 20:06:37 -0000	4.33.2.1
***************
*** 15,20 ****
  #define PHYSMEM_HH
  
- #include "rcs_defs.hh"		/* _Windows, RCS_FAR, EXTERN_C_STD_HEADERS */
- 
  #ifdef  EXTERN_C_STD_HEADERS
  extern "C"
--- 15,18 ----
***************
*** 28,79 ****
  #endif
  
  
! #ifdef USE_BIT3
! #ifndef USING_BIT3
! #define USING_BIT3
! #endif
! #endif
! 
! #ifdef USING_BIT3
! #ifndef USE_BIT3
! #define USE_BIT3
! #endif
! #endif
! 
! 
! #ifdef WIN16
! #include <windows.h>		/* LPBYTE, WORD */
! typedef LPBYTE LOCAL_ADDRESS_TYPE;
! #else
! typedef char RCS_FAR *LOCAL_ADDRESS_TYPE;
! #endif
! 
! #if defined(WIN32) && !defined(gnuwin32)
! #if defined(WIN32) && !defined(USE_OLD_WINSOCK)
! /* Lame problem if windows.h is included before winsock2.h many redefined
!  compiler errors result. */
! #include <winsock2.h>
! #endif
! #include <windows.h>		/* HANDLE */
! #include "mapmem.h"		/* PHYSICAL_MEMORY_INFO */
! #include "gpioctl.h"		/* GENPORT_WRITE_INPUT */
! #endif
! 
! #if defined(USE_BIT3) && defined(WIN32)
! #include "btapi.h"
! #endif
! 
! /* ADDRESS TYPE MACROS --
! * Under Windows Pass one of these as the _address_code for
! * PHYSMEM_HANDLE */
! #define NT_ISA_MEM_ADDRESS      ((long) 1)
! #define NT_ISA_IO_ADDRESS       ((long) 2)
! 
! class RCS_EXPORT PHYSMEM_HANDLE
  {
  public:
    PHYSMEM_HANDLE ();		/* Constructor for blank handle. */
  #if defined(USE_BIT3) && defined(WIN32)
!   PHYSMEM_HANDLE (bt_desc_t _btd, unsigned long _btd_offset, long _size,
  		  int _swap_mode);
  #endif
--- 26,37 ----
  #endif
  
+ class PHYSMEM_INTERNALS;
  
! class PHYSMEM_HANDLE
  {
  public:
    PHYSMEM_HANDLE ();		/* Constructor for blank handle. */
  #if defined(USE_BIT3) && defined(WIN32)
!   PHYSMEM_HANDLE (void *_btd_ptr, unsigned long _btd_offset, long _size,
  		  int _swap_mode);
  #endif
***************
*** 105,146 ****
    char *temp_buf;
    unsigned long physical_address;
-   LOCAL_ADDRESS_TYPE local_address;
  protected:
! #ifdef VXWORKS
!   char RCS_FAR *bus_address;
! #endif
! #ifdef WIN16
!   WORD selector;
! #endif
! #if defined(WIN32) && !defined(gnuwin32)
!   HANDLE hMapMemDriver;
!   HANDLE hGenPortDriver;
!   PHYSICAL_MEMORY_INFO pmi;
!   GENPORT_WRITE_INPUT gpwi;
!   WORD ioport;
!   int read_from_genport (void *, long);
!   int read_dword_from_genport (DWORD *, ULONG);
!   int read_word_from_genport (WORD *, ULONG);
!   int read_byte_from_genport (BYTE *, ULONG);
!   int write_to_genport (void *, long);
!   int write_dword_to_genport (DWORD, ULONG);
!   int write_word_to_genport (WORD, ULONG);
!   int write_byte_to_genport (BYTE, ULONG);
! #endif
  
- #ifdef lynxosPC
-   char smem_name[40];
- #endif
  
  public:
  
- #if defined(USE_BIT3) && defined(WIN32)
-     bt_desc_t btd;
-   unsigned long btd_offset;
-   int swap_mode;
-   bt_msec_t bt_lock_timeout;
-   int bt_use_lock;
-   bt_error_t bt_status;		/* Mirror API return value */
- #endif
    int using_bit3;
    double total_bytes_moved;
--- 63,73 ----
    char *temp_buf;
    unsigned long physical_address;
  protected:
!   class PHYSMEM_INTERNALS *internals;
! 
  
  
  public:
  
    int using_bit3;
    double total_bytes_moved;

Index: recvline.c
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/recvline.c,v
retrieving revision 4.38
retrieving revision 4.38.2.1
diff -C2 -d -r4.38 -r4.38.2.1
*** recvline.c	6 May 2003 15:18:15 -0000	4.38
--- recvline.c	22 Aug 2003 20:06:37 -0000	4.38.2.1
***************
*** 9,49 ****
  #endif
  
- #include "rcs_defs.hh"		/* _Windows */
- 
  #include "recvline.h"		/* recvline(int, void *, int, double) */
  
  #ifdef HAVE_CONFIG_H
  #include "rcs_config_include.h"
- 
- #else
- 
- #if (!defined(_Windows) && !defined(MSDOS)) || defined(gnuwin32)
- #include <unistd.h>		/*  select() */
- #include <sys/types.h>		/* typedef fd_set, FD_ZERO, FD_SET */
- #include <sys/socket.h>		/* recv() */
- #ifndef VXWORKS
- #include <sys/time.h>		/* struct timeval */
  #else
! #include <sys/times.h>		/* struct timeval */
! #endif
! #else
! #ifdef _Windows
! #ifdef USE_OLD_WINSOCK
! #include <winsock.h>		/* select(), typedef fd_set, FD_ZERO, FD_SET, struct */
! #else
! #include <winsock2.h>
! #endif
! #else
! #include <tklib.h>		/* select(), recv(), typedef fd_set, FD_ZERO, FD_SET */
! #include <tk_errno.h>		/* tk_geterrno(), EWOULDBLOCK */
! #endif
  #endif
- #include <stddef.h>		/* size_t */
- #include <errno.h>		/* errno */
- #include <stdlib.h>		/* malloc(), free() */
- #include <string.h>		/* strerror() */
- #include <math.h>		/* modf(), fabs() */
- 
- #endif /* HAVE_CONFIG_H */
  
  #include "rcs_prnt.hh"		/* rcs_print_error() */
--- 9,19 ----
  #endif
  
  #include "recvline.h"		/* recvline(int, void *, int, double) */
  
  #ifdef HAVE_CONFIG_H
  #include "rcs_config_include.h"
  #else
! #include "recvline_no_config.h"
  #endif
  
  #include "rcs_prnt.hh"		/* rcs_print_error() */
***************
*** 183,187 ****
  	  int *bytes_read_ptr)
  {
! #if defined(_Windows)
    int error_value = 0;
  #endif
--- 153,159 ----
  	  int *bytes_read_ptr)
  {
!   unsigned long ioctlsocket_arg;
! 
! #if defined(_Windows) || defined(WIN32)
    int error_value = 0;
  #endif
***************
*** 503,508 ****
  	    }
  	}
! #if defined(WIN32) && !defined(gnuwin32)
!       dl_ioctlsocket (fd, FIONREAD, &bytes_ready);
  #else
  #ifndef VXWORKS
--- 475,482 ----
  	    }
  	}
! #if defined(WIN32) && !defined(gnuwin32) || defined(WIN32)
!       ioctlsocket_arg = (unsigned long ) bytes_ready;
!       dl_ioctlsocket (fd, FIONREAD, &ioctlsocket_arg);
!       bytes_ready = ioctlsocket_arg;
  #else
  #ifndef VXWORKS
***************
*** 539,543 ****
        if ((nrecv = dl_recv (fd, ptr, bytes_ready, flags)) == -1)
  	{
! #if (!defined(_WINDOWS) && !defined(MSDOS)) || defined(gnuwin32)
  	  if (errno == EWOULDBLOCK)
  	    {
--- 513,517 ----
        if ((nrecv = dl_recv (fd, ptr, bytes_ready, flags)) == -1)
  	{
! #if (!defined(_WINDOWS) && !defined(WIN32) && !defined(MSDOS)) || defined(gnuwin32) 
  	  if (errno == EWOULDBLOCK)
  	    {
***************
*** 563,567 ****
  	    }
  #else
! #if defined(_Windows)
  	  error_value = dl_WSAGetLastError ();
  	  if (WSAEWOULDBLOCK != error_value)
--- 537,541 ----
  	    }
  #else
! #if defined(_Windows) || defined(WIN32)
  	  error_value = dl_WSAGetLastError ();
  	  if (WSAEWOULDBLOCK != error_value)

Index: rem_msg.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/rem_msg.hh,v
retrieving revision 4.35
retrieving revision 4.35.2.1
diff -C2 -d -r4.35 -r4.35.2.1
*** rem_msg.hh	6 May 2003 15:18:15 -0000	4.35
--- rem_msg.hh	22 Aug 2003 20:06:37 -0000	4.35.2.1
***************
*** 17,28 ****
  #define REM_MSG_HH
  
- #include "rcs_defs.hh"		/* RCS_EXPORT, RCS_PASCAL, RCS_FAR */
- 
  
! class RCS_EXPORT CMS_DIAGNOSTICS_INFO;
! struct RCS_EXPORT CMS_HEADER;
  
  
! struct RCS_EXPORT REMOTE_CMS_MESSAGE
  {
  };
--- 17,26 ----
  #define REM_MSG_HH
  
  
! class  CMS_DIAGNOSTICS_INFO;
! struct  CMS_HEADER;
  
  
! struct  REMOTE_CMS_MESSAGE
  {
  };
***************
*** 52,56 ****
  };
  
! struct RCS_EXPORT REMOTE_CLIENT_ID
  {
  public:
--- 50,54 ----
  };
  
! struct  REMOTE_CLIENT_ID
  {
  public:
***************
*** 66,70 ****
  
  
! struct RCS_EXPORT REMOTE_CMS_REQUEST:public REMOTE_CMS_MESSAGE
  {
    REMOTE_CMS_REQUEST (REMOTE_CMS_REQUEST_TYPE _type)
--- 64,68 ----
  
  
! struct  REMOTE_CMS_REQUEST:public REMOTE_CMS_MESSAGE
  {
    REMOTE_CMS_REQUEST (REMOTE_CMS_REQUEST_TYPE _type)
***************
*** 80,84 ****
  };
  
! struct RCS_EXPORT REMOTE_CMS_REPLY:public REMOTE_CMS_MESSAGE
  {
    REMOTE_CMS_REPLY ()
--- 78,82 ----
  };
  
! struct  REMOTE_CMS_REPLY:public REMOTE_CMS_MESSAGE
  {
    REMOTE_CMS_REPLY ()
***************
*** 90,94 ****
  
  /* Structure sent by client to server to initiate a read. */
! struct RCS_EXPORT REMOTE_BLOCKING_READ_REQUEST:public REMOTE_CMS_REQUEST
  {
    REMOTE_BLOCKING_READ_REQUEST ():REMOTE_CMS_REQUEST
--- 88,92 ----
  
  /* Structure sent by client to server to initiate a read. */
! struct  REMOTE_BLOCKING_READ_REQUEST:public REMOTE_CMS_REQUEST
  {
    REMOTE_BLOCKING_READ_REQUEST ():REMOTE_CMS_REQUEST
***************
*** 108,112 ****
  
  /* Structure sent by client to server to initiate a read. */
! struct RCS_EXPORT REMOTE_GET_BUF_NAME_REQUEST:public REMOTE_CMS_REQUEST
  {
    REMOTE_GET_BUF_NAME_REQUEST ():REMOTE_CMS_REQUEST
--- 106,110 ----
  
  /* Structure sent by client to server to initiate a read. */
! struct  REMOTE_GET_BUF_NAME_REQUEST:public REMOTE_CMS_REQUEST
  {
    REMOTE_GET_BUF_NAME_REQUEST ():REMOTE_CMS_REQUEST
***************
*** 116,120 ****
  };
  
! struct RCS_EXPORT REMOTE_READ_REQUEST:public REMOTE_CMS_REQUEST
  {
    REMOTE_READ_REQUEST ():REMOTE_CMS_REQUEST (REMOTE_CMS_READ_REQUEST_TYPE)
--- 114,118 ----
  };
  
! struct  REMOTE_READ_REQUEST:public REMOTE_CMS_REQUEST
  {
    REMOTE_READ_REQUEST ():REMOTE_CMS_REQUEST (REMOTE_CMS_READ_REQUEST_TYPE)
***************
*** 129,142 ****
  
  /* Structure returned by server to client after a read. */
! struct RCS_EXPORT REMOTE_READ_REPLY:public REMOTE_CMS_REPLY
  {
    int size;			/* size of message stored in data. */
    long write_id;		/* Id from the buffer. */
    long was_read;		/* Was this message already read? */
!   void RCS_FAR *data;		/* Location of stored message. */
  };
  
  /* Structure returned by server to client after a read. */
! struct RCS_EXPORT REMOTE_GET_BUF_NAME_REPLY:public REMOTE_CMS_REPLY
  {
    char name[32];		/* Location of stored buffer name (truncated to 31 characters). */
--- 127,140 ----
  
  /* Structure returned by server to client after a read. */
! struct  REMOTE_READ_REPLY:public REMOTE_CMS_REPLY
  {
    int size;			/* size of message stored in data. */
    long write_id;		/* Id from the buffer. */
    long was_read;		/* Was this message already read? */
!   void *data;		/* Location of stored message. */
  };
  
  /* Structure returned by server to client after a read. */
! struct  REMOTE_GET_BUF_NAME_REPLY:public REMOTE_CMS_REPLY
  {
    char name[32];		/* Location of stored buffer name (truncated to 31 characters). */
***************
*** 145,168 ****
  
  /* Structure returned by server to client after a read. */
! struct RCS_EXPORT REMOTE_BLOCKING_READ_REPLY:public REMOTE_READ_REPLY
  {
  };
  
  /* Structure sent by client to server to initiate a write. */
! struct RCS_EXPORT REMOTE_WRITE_REQUEST:public REMOTE_CMS_REQUEST
  {
    REMOTE_WRITE_REQUEST ():REMOTE_CMS_REQUEST (REMOTE_CMS_WRITE_REQUEST_TYPE)
    {
!     data = NULL;
      size = 0;
    };
    int access_type;		/* write or write_if_read */
    int size;			/* size of message in data */
!   void RCS_FAR *data;		/* location of message to write into buffer */
    void *_nml;
  };
  
  /* Structure returned by server to client after a write. */
! struct RCS_EXPORT REMOTE_WRITE_REPLY:public REMOTE_CMS_REPLY
  {
    long was_read;		/* Was the message to be overwriten ever read? */
--- 143,166 ----
  
  /* Structure returned by server to client after a read. */
! struct  REMOTE_BLOCKING_READ_REPLY:public REMOTE_READ_REPLY
  {
  };
  
  /* Structure sent by client to server to initiate a write. */
! struct  REMOTE_WRITE_REQUEST:public REMOTE_CMS_REQUEST
  {
    REMOTE_WRITE_REQUEST ():REMOTE_CMS_REQUEST (REMOTE_CMS_WRITE_REQUEST_TYPE)
    {
!     data = 0;
      size = 0;
    };
    int access_type;		/* write or write_if_read */
    int size;			/* size of message in data */
!   void *data;		/* location of message to write into buffer */
    void *_nml;
  };
  
  /* Structure returned by server to client after a write. */
! struct  REMOTE_WRITE_REPLY:public REMOTE_CMS_REPLY
  {
    long was_read;		/* Was the message to be overwriten ever read? */
***************
*** 170,174 ****
  };
  
! struct RCS_EXPORT REMOTE_CHECK_IF_READ_REQUEST:public REMOTE_CMS_REQUEST
  {
    REMOTE_CHECK_IF_READ_REQUEST ():REMOTE_CMS_REQUEST
--- 168,172 ----
  };
  
! struct  REMOTE_CHECK_IF_READ_REQUEST:public REMOTE_CMS_REQUEST
  {
    REMOTE_CHECK_IF_READ_REQUEST ():REMOTE_CMS_REQUEST
***************
*** 178,187 ****
  };
  
! struct RCS_EXPORT REMOTE_CHECK_IF_READ_REPLY:public REMOTE_CMS_REPLY
  {
    int was_read;
  };
  
! struct RCS_EXPORT REMOTE_CLEAR_REQUEST:public REMOTE_CMS_REQUEST
  {
    REMOTE_CLEAR_REQUEST ():REMOTE_CMS_REQUEST (REMOTE_CMS_CLEAR_REQUEST_TYPE)
--- 176,185 ----
  };
  
! struct  REMOTE_CHECK_IF_READ_REPLY:public REMOTE_CMS_REPLY
  {
    int was_read;
  };
  
! struct  REMOTE_CLEAR_REQUEST:public REMOTE_CMS_REQUEST
  {
    REMOTE_CLEAR_REQUEST ():REMOTE_CMS_REQUEST (REMOTE_CMS_CLEAR_REQUEST_TYPE)
***************
*** 190,198 ****
  };
  
! struct RCS_EXPORT REMOTE_CLEAR_REPLY:public REMOTE_CMS_REPLY
  {
  };
  
! struct RCS_EXPORT REMOTE_CLOSE_CHANNEL_REQUEST:public REMOTE_CMS_REQUEST
  {
    REMOTE_CLOSE_CHANNEL_REQUEST ():REMOTE_CMS_REQUEST
--- 188,196 ----
  };
  
! struct  REMOTE_CLEAR_REPLY:public REMOTE_CMS_REPLY
  {
  };
  
! struct  REMOTE_CLOSE_CHANNEL_REQUEST:public REMOTE_CMS_REQUEST
  {
    REMOTE_CLOSE_CHANNEL_REQUEST ():REMOTE_CMS_REQUEST
***************
*** 202,211 ****
  };
  
! struct RCS_EXPORT REMOTE_CLOSE_CHANNEL_REPLY:public REMOTE_CMS_REPLY
  {
  };
  
  
! struct RCS_EXPORT REMOTE_GET_KEYS_REQUEST:public REMOTE_CMS_REQUEST
  {
    REMOTE_GET_KEYS_REQUEST ():REMOTE_CMS_REQUEST
--- 200,209 ----
  };
  
! struct  REMOTE_CLOSE_CHANNEL_REPLY:public REMOTE_CMS_REPLY
  {
  };
  
  
! struct  REMOTE_GET_KEYS_REQUEST:public REMOTE_CMS_REQUEST
  {
    REMOTE_GET_KEYS_REQUEST ():REMOTE_CMS_REQUEST
***************
*** 216,220 ****
  };
  
! struct RCS_EXPORT REMOTE_GET_KEYS_REPLY:public REMOTE_CMS_REPLY
  {
    char key1[8];
--- 214,218 ----
  };
  
! struct  REMOTE_GET_KEYS_REPLY:public REMOTE_CMS_REPLY
  {
    char key1[8];
***************
*** 222,226 ****
  };
  
! struct RCS_EXPORT REMOTE_LOGIN_REQUEST:public REMOTE_CMS_REQUEST
  {
    REMOTE_LOGIN_REQUEST ():REMOTE_CMS_REQUEST (REMOTE_CMS_LOGIN_REQUEST_TYPE)
--- 220,224 ----
  };
  
! struct  REMOTE_LOGIN_REQUEST:public REMOTE_CMS_REQUEST
  {
    REMOTE_LOGIN_REQUEST ():REMOTE_CMS_REQUEST (REMOTE_CMS_LOGIN_REQUEST_TYPE)
***************
*** 231,235 ****
  };
  
! struct RCS_EXPORT REMOTE_LOGIN_REPLY:public REMOTE_CMS_REPLY
  {
    int success;			// 1 = logged in, 0 = not
--- 229,233 ----
  };
  
! struct  REMOTE_LOGIN_REPLY:public REMOTE_CMS_REPLY
  {
    int success;			// 1 = logged in, 0 = not
***************
*** 243,247 ****
  };
  
! struct RCS_EXPORT REMOTE_SET_SUBSCRIPTION_REQUEST:public REMOTE_CMS_REQUEST
  {
    REMOTE_SET_SUBSCRIPTION_REQUEST ():REMOTE_CMS_REQUEST
--- 241,245 ----
  };
  
! struct  REMOTE_SET_SUBSCRIPTION_REQUEST:public REMOTE_CMS_REQUEST
  {
    REMOTE_SET_SUBSCRIPTION_REQUEST ():REMOTE_CMS_REQUEST
***************
*** 254,258 ****
  };
  
! struct RCS_EXPORT REMOTE_SET_SUBSCRIPTION_REPLY:public REMOTE_CMS_REPLY
  {
    int success;			// 1 = logged in, 0 = not
--- 252,256 ----
  };
  
! struct  REMOTE_SET_SUBSCRIPTION_REPLY:public REMOTE_CMS_REPLY
  {
    int success;			// 1 = logged in, 0 = not
***************
*** 261,265 ****
  
  
! struct RCS_EXPORT REMOTE_CANCEL_SUBSCRIPTION_REQUEST:public REMOTE_CMS_REQUEST
  {
    REMOTE_CANC...
 
[truncated message content]

[Emc-commit] rcslib/src/node cmd_msg.hh,4.34,4.34.2.1 nml_mod.cc,4.38.2.1,4.38.2.2 nml_mod.hh,4.34,4.34.2.1 nml_oi.cc,4.32,4.32.2.1 nml_oi.hh,4.34,4.34.2.1 stat_msg.cc,4.34,4.34.2.1 stat_msg.hh,4.34,4.34.2.1 wm_msg.hh,4.32,4.32.2.1

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

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

Modified Files:
      Tag: wps_multiplat_dev_branch
	cmd_msg.hh nml_mod.cc nml_mod.hh nml_oi.cc nml_oi.hh 
	stat_msg.cc stat_msg.hh wm_msg.hh 
Log Message:
.

Index: cmd_msg.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/node/cmd_msg.hh,v
retrieving revision 4.34
retrieving revision 4.34.2.1
diff -C2 -d -r4.34 -r4.34.2.1
*** cmd_msg.hh	6 May 2003 15:18:20 -0000	4.34
--- cmd_msg.hh	22 Aug 2003 20:06:37 -0000	4.34.2.1
***************
*** 3,13 ****
  #define RCS_CMD_HH
  
- 
- #include "rcs_defs.hh"		/* RCS_EXPORT */
- 
  #include "nml.hh"
  #include "nmlmsg.hh"
  
! class RCS_EXPORT RCS_CMD_MSG:public NMLmsg
  {
  public:
--- 3,10 ----
  #define RCS_CMD_HH
  
  #include "nml.hh"
  #include "nmlmsg.hh"
  
! class RCS_CMD_MSG:public NMLmsg
  {
  public:
***************
*** 17,24 ****
  };
  
! extern int RCS_EXPORT RCS_CMD_MSG_format (NMLTYPE, void RCS_FAR *,
! 					  CMS RCS_FAR *);
  
! class RCS_EXPORT RCS_CMD_CHANNEL:public NML
  {
  public:
--- 14,20 ----
  };
  
! extern int RCS_CMD_MSG_format (NMLTYPE, void *,CMS *);
  
! class RCS_CMD_CHANNEL:public NML
  {
  public:
***************
*** 40,44 ****
  #define RCS_GENERIC_CMD_TYPE    ((NMLTYPE) 1000000)
  
! class RCS_EXPORT RCS_GENERIC_CMD:public RCS_CMD_MSG
  {
  public:
--- 36,40 ----
  #define RCS_GENERIC_CMD_TYPE    ((NMLTYPE) 1000000)
  
! class RCS_GENERIC_CMD:public RCS_CMD_MSG
  {
  public:

Index: nml_mod.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/node/nml_mod.cc,v
retrieving revision 4.38.2.1
retrieving revision 4.38.2.2
diff -C2 -d -r4.38.2.1 -r4.38.2.2
*** nml_mod.cc	8 Aug 2003 14:21:13 -0000	4.38.2.1
--- nml_mod.cc	22 Aug 2003 20:06:37 -0000	4.38.2.2
***************
*** 30,53 ****
      */
  
! #ifdef EXTERN_C_STD_HEADERS
! extern "C"
! {
! #endif
! 
! #include <stdlib.h>		// malloc()
! #include <string.h>		// strcpy()
! #include <errno.h>		// errno
! #include <stdarg.h>
! #include <math.h>		// fabs()
  
! #ifdef EXTERN_C_STD_HEADERS
! }
  #endif
  
- 
  #include "nml_mod.hh"
  #include "nml_oi.hh"		// NML_ERROR, NML_TEXT, NML_DISPLAY
  #include "rcs_prnt.hh"
  
  
  NML_MODULE::NML_MODULE (const char *inifile, const char *section)
--- 30,61 ----
      */
  
! #if HAVE_CONFIG_H
! #include "rcs_config_include.h"
  
! #else
! #include "nml_mod_no_config.h"
  #endif
  
  #include "nml_mod.hh"
  #include "nml_oi.hh"		// NML_ERROR, NML_TEXT, NML_DISPLAY
  #include "rcs_prnt.hh"
  
+ #ifdef DEBUG_MEMORY
+ #include "dbg_mem.h"
+ #else
+ #ifndef DEBUG_MALLOC
+ #define DEBUG_MALLOC malloc
+ #endif
+ #ifndef DEBUG_CALLOC
+ #define DEBUG_CALLOC calloc
+ #endif
+ #ifndef DEBUG_REALLOC
+ #define DEBUG_REALLOC realloc
+ #endif
+ #ifndef DEBUG_FREE
+ #define DEBUG_FREE free
+ #endif
+ #endif
+ // DEBUG_MEMORY
  
  NML_MODULE::NML_MODULE (const char *inifile, const char *section)

Index: nml_mod.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/node/nml_mod.hh,v
retrieving revision 4.34
retrieving revision 4.34.2.1
diff -C2 -d -r4.34 -r4.34.2.1
*** nml_mod.hh	7 Apr 2003 15:37:23 -0000	4.34
--- nml_mod.hh	22 Aug 2003 20:06:37 -0000	4.34.2.1
***************
*** 45,51 ****
  #include "inifile.h"		// class INIFILE
  
- 
- 
- 
  #define STATE_MATCH (set_file_and_line(__FILE__,__LINE__)),stateMatch
  
--- 45,48 ----
***************
*** 64,68 ****
  
  #if 0
! class RCS_EXPORT NML_MODULE_INI_INFO
  {
  public:
--- 61,65 ----
  
  #if 0
! class NML_MODULE_INI_INFO
  {
  public:
***************
*** 86,90 ****
  #endif
  
! class RCS_EXPORT NML_MODULE
  {
  public:
--- 83,87 ----
  #endif
  
! class NML_MODULE
  {
  public:

Index: nml_oi.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/node/nml_oi.cc,v
retrieving revision 4.32
retrieving revision 4.32.2.1
diff -C2 -d -r4.32 -r4.32.2.1
*** nml_oi.cc	6 Sep 2001 14:32:55 -0000	4.32
--- nml_oi.cc	22 Aug 2003 20:06:37 -0000	4.32.2.1
***************
*** 45,49 ****
  }
  
! int RCS_EXPORT
  nmlErrorFormat (NMLTYPE type, void *buffer, CMS * cms)
  {
--- 45,49 ----
  }
  
! int
  nmlErrorFormat (NMLTYPE type, void *buffer, CMS * cms)
  {

Index: nml_oi.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/node/nml_oi.hh,v
retrieving revision 4.34
retrieving revision 4.34.2.1
diff -C2 -d -r4.34 -r4.34.2.1
*** nml_oi.hh	6 Sep 2001 14:32:55 -0000	4.34
--- nml_oi.hh	22 Aug 2003 20:06:37 -0000	4.34.2.1
***************
*** 16,20 ****
  #define NML_OI_HH
  
- #include "rcs_defs.hh"		// RCS_EXPORT
  #include "cms.hh"		// class CMS
  #include "nml.hh"		// class NML
--- 16,19 ----
***************
*** 37,41 ****
  #define NML_OPERATOR_REPLY_LEN 256
  
! class RCS_EXPORT NML_ERROR:public NMLmsg
  {
  public:
--- 36,40 ----
  #define NML_OPERATOR_REPLY_LEN 256
  
! class  NML_ERROR:public NMLmsg
  {
  public:
***************
*** 51,55 ****
  };
  
! class RCS_EXPORT NML_TEXT:public NMLmsg
  {
  public:
--- 50,54 ----
  };
  
! class  NML_TEXT:public NMLmsg
  {
  public:
***************
*** 65,69 ****
  };
  
! class RCS_EXPORT NML_DISPLAY:public NMLmsg
  {
  public:
--- 64,68 ----
  };
  
! class  NML_DISPLAY:public NMLmsg
  {
  public:
***************
*** 79,83 ****
  };
  
! class RCS_EXPORT NML_OPERATOR_REQUEST:public NMLmsg
  {
  public:
--- 78,82 ----
  };
  
! class  NML_OPERATOR_REQUEST:public NMLmsg
  {
  public:
***************
*** 95,99 ****
  };
  
! class RCS_EXPORT NML_OPERATOR_REPLY:public NMLmsg
  {
  public:
--- 94,98 ----
  };
  
! class  NML_OPERATOR_REPLY:public NMLmsg
  {
  public:
***************
*** 112,116 ****
  
  // NML format function
! extern int RCS_EXPORT nmlErrorFormat (NMLTYPE type, void *buffer, CMS * cms);
  
  
--- 111,115 ----
  
  // NML format function
! extern int  nmlErrorFormat (NMLTYPE type, void *buffer, CMS * cms);
  
  

Index: stat_msg.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/node/stat_msg.cc,v
retrieving revision 4.34
retrieving revision 4.34.2.1
diff -C2 -d -r4.34 -r4.34.2.1
*** stat_msg.cc	6 May 2003 15:18:20 -0000	4.34
--- stat_msg.cc	22 Aug 2003 20:06:37 -0000	4.34.2.1
***************
*** 102,106 ****
  
  int
! RCS_STAT_MSG_format (NMLTYPE t, void RCS_FAR * buf, CMS RCS_FAR * cms)
  {
    if (cms->update_stat_msg_base_in_format)
--- 102,106 ----
  
  int
! RCS_STAT_MSG_format (NMLTYPE t, void * buf, CMS * cms)
  {
    if (cms->update_stat_msg_base_in_format)

Index: stat_msg.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/node/stat_msg.hh,v
retrieving revision 4.34
retrieving revision 4.34.2.1
diff -C2 -d -r4.34 -r4.34.2.1
*** stat_msg.hh	6 May 2003 15:18:20 -0000	4.34
--- stat_msg.hh	22 Aug 2003 20:06:37 -0000	4.34.2.1
***************
*** 3,7 ****
  #define RCS_STAT_HH
  
- #include "rcs_defs.hh"		/* RCS_EXPORT  */
  
  #include "nml.hh"
--- 3,6 ----
***************
*** 75,79 ****
  
  
! class RCS_EXPORT RCS_STAT_MSG:public NMLmsg
  {
  public:
--- 74,78 ----
  
  
! class  RCS_STAT_MSG:public NMLmsg
  {
  public:
***************
*** 93,100 ****
  
  
! extern int RCS_EXPORT RCS_STAT_MSG_format (NMLTYPE, void RCS_FAR *,
! 					   CMS RCS_FAR *);
  
! class RCS_EXPORT RCS_STAT_CHANNEL:public NML
  {
  public:
--- 92,98 ----
  
  
! extern int  RCS_STAT_MSG_format (NMLTYPE, void *, CMS *);
  
! class  RCS_STAT_CHANNEL:public NML
  {
  public:
***************
*** 110,114 ****
  #define RCS_GENERIC_STATUS_TYPE         ((NMLTYPE) 2000000)
  
! class RCS_EXPORT RCS_GENERIC_STATUS:public RCS_STAT_MSG
  {
  public:
--- 108,112 ----
  #define RCS_GENERIC_STATUS_TYPE         ((NMLTYPE) 2000000)
  
! class  RCS_GENERIC_STATUS:public RCS_STAT_MSG
  {
  public:

Index: wm_msg.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/node/wm_msg.hh,v
retrieving revision 4.32
retrieving revision 4.32.2.1
diff -C2 -d -r4.32 -r4.32.2.1
*** wm_msg.hh	6 Sep 2001 14:32:55 -0000	4.32
--- wm_msg.hh	22 Aug 2003 20:06:37 -0000	4.32.2.1
***************
*** 3,14 ****
  #define RCS_WM_HH
  
- 
- #include "rcs_defs.hh"		/* RCS_EXPORT  */
- 
  #include "cms.hh"		/* class CMS */
  #include "nml.hh"		/* class NML, typedef NML_FORMAT_PTR,NMLTYPE */
  #include "nmlmsg.hh"		/* class NMLmsg */
  
! class RCS_EXPORT RCS_WM_MSG:public NMLmsg
  {
  public:
--- 3,11 ----
  #define RCS_WM_HH
  
  #include "cms.hh"		/* class CMS */
  #include "nml.hh"		/* class NML, typedef NML_FORMAT_PTR,NMLTYPE */
  #include "nmlmsg.hh"		/* class NMLmsg */
  
! class RCS_WM_MSG:public NMLmsg
  {
  public:
***************
*** 16,23 ****
  };
  
! extern int RCS_EXPORT RCS_WM_MSG_format (NMLTYPE, void RCS_FAR *,
! 					 CMS RCS_FAR *);
  
! class RCS_EXPORT RCS_WM_CHANNEL:public NML
  {
  public:
--- 13,19 ----
  };
  
! extern int RCS_WM_MSG_format (NMLTYPE, void *, CMS *);
  
! class RCS_WM_CHANNEL:public NML
  {
  public:
***************
*** 33,37 ****
  #define RCS_GENERIC_WM_TYPE     ((NMLTYPE) 3000000)
  
! class RCS_EXPORT RCS_GENERIC_WM:public RCS_WM_MSG
  {
  public:
--- 29,33 ----
  #define RCS_GENERIC_WM_TYPE     ((NMLTYPE) 3000000)
  
! class RCS_GENERIC_WM:public RCS_WM_MSG
  {
  public:

[Emc-commit] rcslib/src/print rcs_prnt.cc,4.43.2.3,4.43.2.4

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

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

Modified Files:
      Tag: wps_multiplat_dev_branch
	rcs_prnt.cc 
Log Message:
.

Index: rcs_prnt.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/print/rcs_prnt.cc,v
retrieving revision 4.43.2.3
retrieving revision 4.43.2.4
diff -C2 -d -r4.43.2.3 -r4.43.2.4
*** rcs_prnt.cc	21 Aug 2003 20:24:15 -0000	4.43.2.3
--- rcs_prnt.cc	22 Aug 2003 20:06:37 -0000	4.43.2.4
***************
*** 11,22 ****
  
  
  #ifndef _TIMER_H
! extern "C" double RCS_EXPORT etime (void);
  #endif
  
! RCS_LINKED_LIST RCS_FAR *rcs_print_list = NULL;
! char RCS_FAR **rcs_lines_table = NULL;
  #if 0
! void (RCS_PASCAL RCS_FAR * rcs_print_notify) () = NULL;
  #endif
  
--- 11,40 ----
  
  
+ #ifdef DEBUG_MEMORY
+ #include "dbg_mem.h"
+ #else
+ #ifndef DEBUG_MALLOC
+ #define DEBUG_MALLOC malloc
+ #endif
+ #ifndef DEBUG_CALLOC
+ #define DEBUG_CALLOC calloc
+ #endif
+ #ifndef DEBUG_REALLOC
+ #define DEBUG_REALLOC realloc
+ #endif
+ #ifndef DEBUG_FREE
+ #define DEBUG_FREE free
+ #endif
+ #endif
+ // DEBUG_MEMORY
+ 
  #ifndef _TIMER_H
! extern "C" double etime (void);
  #endif
  
! RCS_LINKED_LIST *rcs_print_list = NULL;
! char **rcs_lines_table = NULL;
  #if 0
! void (RCS_PASCAL * rcs_print_notify) () = NULL;
  #endif
  
***************
*** 51,55 ****
  
  
! void RCS_EXPORT
  set_rcs_print_destination (RCS_PRINT_DESTINATION_TYPE _dest)
  {
--- 69,73 ----
  
  
! void
  set_rcs_print_destination (RCS_PRINT_DESTINATION_TYPE _dest)
  {
***************
*** 61,65 ****
  }
  
! RCS_PRINT_DESTINATION_TYPE RCS_EXPORT
  get_rcs_print_destination ()
  {
--- 79,83 ----
  }
  
! RCS_PRINT_DESTINATION_TYPE
  get_rcs_print_destination ()
  {
***************
*** 68,75 ****
  
  #ifdef USING_DECLSPEC
! RCS_EXPORT char RCS_FAR **
  get_rcs_lines_table ()
  #else
! char RCS_FAR **RCS_EXPORT
  get_rcs_lines_table ()
  #endif
--- 86,93 ----
  
  #ifdef USING_DECLSPEC
! char **
  get_rcs_lines_table ()
  #else
! char **RCS_EXPORT
  get_rcs_lines_table ()
  #endif
***************
*** 79,86 ****
  
  #ifdef USING_DECLSPEC
! RCS_EXPORT RCS_LINKED_LIST RCS_FAR *
  get_rcs_print_list ()
  #else
! RCS_LINKED_LIST RCS_FAR *RCS_EXPORT
  get_rcs_print_list ()
  #endif
--- 97,104 ----
  
  #ifdef USING_DECLSPEC
! RCS_LINKED_LIST *
  get_rcs_print_list ()
  #else
! RCS_LINKED_LIST *RCS_EXPORT
  get_rcs_print_list ()
  #endif
***************
*** 89,93 ****
  }
  
! int RCS_EXPORT
  get_rcs_print_list_size ()
  {
--- 107,111 ----
  }
  
! int
  get_rcs_print_list_size ()
  {
***************
*** 101,105 ****
      }
  }
! void RCS_EXPORT
  set_rcs_print_list_sizing (int _new_max_size,
  			   LIST_SIZING_MODE _new_sizing_mode)
--- 119,123 ----
      }
  }
! void
  set_rcs_print_list_sizing (int _new_max_size,
  			   LIST_SIZING_MODE _new_sizing_mode)
***************
*** 117,121 ****
  #if 0
  
! void RCS_EXPORT
  set_rcs_print_notify (RCS_PRINT_NOTIFY_FUNC_PTR _rcs_print_notify)
  {
--- 135,139 ----
  #if 0
  
! void
  set_rcs_print_notify (RCS_PRINT_NOTIFY_FUNC_PTR _rcs_print_notify)
  {
***************
*** 124,128 ****
  #endif
  
! void RCS_EXPORT
  clean_print_list ()
  {
--- 142,146 ----
  #endif
  
! void
  clean_print_list ()
  {
***************
*** 134,139 ****
  }
  
! void RCS_EXPORT
! output_print_list (int output_func (char RCS_FAR *))
  {
    if (NULL != rcs_print_list)
--- 152,157 ----
  }
  
! void
! output_print_list (int output_func (char *))
  {
    if (NULL != rcs_print_list)
***************
*** 152,156 ****
  }
  
! int RCS_EXPORT
  count_characters_in_print_list ()
  {
--- 170,174 ----
  }
  
! int
  count_characters_in_print_list ()
  {
***************
*** 169,173 ****
  }
  
! int RCS_EXPORT
  count_lines_in_print_list ()
  {
--- 187,191 ----
  }
  
! int
  count_lines_in_print_list ()
  {
***************
*** 192,196 ****
  }
  
! void RCS_EXPORT
  convert_print_list_to_lines ()
  {
--- 210,214 ----
  }
  
! void
  convert_print_list_to_lines ()
  {
***************
*** 270,274 ****
  }
  
! void RCS_EXPORT
  update_lines_table ()
  {
--- 288,292 ----
  }
  
! void
  update_lines_table ()
  {
***************
*** 281,285 ****
      {
        convert_print_list_to_lines ();
!       rcs_lines_table = (char RCS_FAR **) DEBUG_MALLOC (sizeof (char *)
  							*
  							rcs_print_list->
--- 299,303 ----
      {
        convert_print_list_to_lines ();
!       rcs_lines_table = (char **) DEBUG_MALLOC (sizeof (char *)
  							*
  							rcs_print_list->
***************
*** 301,309 ****
  
  #ifdef USING_DECLSPEC
! RCS_EXPORT char RCS_FAR *
! strip_control_characters (char RCS_FAR * _dest, char RCS_FAR * _src)
  #else
! char RCS_FAR *RCS_EXPORT
! strip_control_characters (char RCS_FAR * _dest, char RCS_FAR * _src)
  #endif
  {
--- 319,327 ----
  
  #ifdef USING_DECLSPEC
! char *
! strip_control_characters (char * _dest, char * _src)
  #else
! char *RCS_EXPORT
! strip_control_characters (char * _dest, char * _src)
  #endif
  {
***************
*** 354,358 ****
  
  
! void RCS_EXPORT
  bad_char_to_print (char *ptr)
  {
--- 372,376 ----
  
  
! void
  bad_char_to_print (char *ptr)
  {
***************
*** 363,368 ****
  }
  
! int RCS_EXPORT
! rcs_vprint (char RCS_FAR * _fmt, va_list _args, int save_string)
  {
    static char temp_string[4096];
--- 381,386 ----
  }
  
! int
! rcs_vprint (char * _fmt, va_list _args, int save_string)
  {
    static char temp_string[4096];
***************
*** 431,436 ****
  }
  
! int RCS_EXPORT
! rcs_puts (char RCS_FAR * _str)
  {
    int retval, retval2;
--- 449,454 ----
  }
  
! int
! rcs_puts (char * _str)
  {
    int retval, retval2;
***************
*** 451,456 ****
  }
  
! int RCS_EXPORT
! rcs_fputs (char RCS_FAR * _str)
  {
    int retval = EOF;
--- 469,474 ----
  }
  
! int
! rcs_fputs (char * _str)
  {
    int retval = EOF;
***************
*** 583,587 ****
  }
  
! void RCS_EXPORT
  close_rcs_printing ()
  {
--- 601,605 ----
  }
  
! void
  close_rcs_printing ()
  {
***************
*** 605,610 ****
  }
  
! int RCS_EXPORT
! set_rcs_print_file (char RCS_FAR * _file_name)
  {
    if (_file_name == NULL)
--- 623,628 ----
  }
  
! int
! set_rcs_print_file (char * _file_name)
  {
    if (_file_name == NULL)
***************
*** 629,634 ****
  }
  
! int RCS_EXPORT
! rcs_print (char RCS_FAR * _fmt, ...)
  {
    static char temp_buffer[1024];
--- 647,652 ----
  }
  
! int
! rcs_print (char * _fmt, ...)
  {
    static char temp_buffer[1024];
***************
*** 672,676 ****
  static const char *rcs_error_filename = NULL;
  static int rcs_error_linenum = -1;
! int RCS_EXPORT
  set_print_rcs_error_info (const char *file, int line)
  {
--- 690,694 ----
  static const char *rcs_error_filename = NULL;
  static int rcs_error_linenum = -1;
! int
  set_print_rcs_error_info (const char *file, int line)
  {
***************
*** 681,686 ****
  
  
! int RCS_EXPORT
! print_rcs_error_new (char RCS_FAR * _fmt, ...)
  {
    int retval = 0;
--- 699,704 ----
  
  
! int
! print_rcs_error_new (char * _fmt, ...)
  {
    int retval = 0;
***************
*** 725,729 ****
  static const char *rcs_debug_filename = NULL;
  static int rcs_debug_linenum = -1;
! int RCS_EXPORT
  set_print_rcs_debug_info (const char *file, int line)
  {
--- 743,747 ----
  static const char *rcs_debug_filename = NULL;
  static int rcs_debug_linenum = -1;
! int
  set_print_rcs_debug_info (const char *file, int line)
  {
***************
*** 734,739 ****
  
  
! int RCS_EXPORT
! print_rcs_debug_new (long flag_to_check, char RCS_FAR * _fmt, ...)
  {
    int retval = 0;
--- 752,757 ----
  
  
! int
! print_rcs_debug_new (long flag_to_check, char * _fmt, ...)
  {
    int retval = 0;
***************
*** 763,768 ****
  #endif
  
! int RCS_EXPORT
! rcs_print_debug (long flag_to_check, char RCS_FAR * _fmt, ...)
  {
    int retval = 0;
--- 781,786 ----
  #endif
  
! int
! rcs_print_debug (long flag_to_check, char * _fmt, ...)
  {
    int retval = 0;
***************
*** 789,793 ****
  }
  
! void RCS_EXPORT
  set_rcs_print_flag (unsigned long flag_to_set)
  {
--- 807,811 ----
  }
  
! void
  set_rcs_print_flag (unsigned long flag_to_set)
  {
***************
*** 800,804 ****
  }
  
! void RCS_EXPORT
  clear_rcs_print_flag (unsigned long flag_to_clear)
  {
--- 818,822 ----
  }
  
! void
  clear_rcs_print_flag (unsigned long flag_to_clear)
  {
***************
*** 813,818 ****
  
  
! int RCS_EXPORT
! rcs_print_sys_error (int error_source, char RCS_FAR * _fmt, ...)
  {
    static char temp_string[256];
--- 831,836 ----
  
  
! int
! rcs_print_sys_error (int error_source, char * _fmt, ...)
  {
    static char temp_string[256];
***************
*** 915,923 ****
  extern "C"
  {
!   int RCS_EXPORT rcs_print_error (char RCS_FAR * _fmt, ...);
  }
  
! int RCS_EXPORT
! rcs_print_error (char RCS_FAR * _fmt, ...)
  {
    int retval = 0;
--- 933,941 ----
  extern "C"
  {
!   int rcs_print_error (char * _fmt, ...);
  }
  
! int
! rcs_print_error (char * _fmt, ...)
  {
    int retval = 0;

[Emc-commit] rcslib/src/stg_clss linklist.hh,4.35,4.35.2.1

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

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

Modified Files:
      Tag: wps_multiplat_dev_branch
	linklist.hh 
Log Message:
.

Index: linklist.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/stg_clss/linklist.hh,v
retrieving revision 4.35
retrieving revision 4.35.2.1
diff -C2 -d -r4.35 -r4.35.2.1
*** linklist.hh	6 May 2003 15:18:22 -0000	4.35
--- linklist.hh	22 Aug 2003 20:06:37 -0000	4.35.2.1
***************
*** 3,12 ****
  #define LINKED_LIST_HH
  
- #ifndef DO_NOT_USE_RCSLIB
- #include "rcs_defs.hh"		/* RCS_EXPORT, EXTERN_C_STD_HEADERS */
- #else
- #define RCS_EXPORT
- #endif
- 
  #ifdef EXTERN_C_STD_HEADERS
  extern "C"
--- 3,6 ----
***************
*** 14,18 ****
  #endif
  
! #include <stddef.h>
  
  #ifdef DEBUG_MEMORY
--- 8,12 ----
  #endif
  
! #include <stddef.h>		// size_t
  
  #ifdef DEBUG_MEMORY
***************
*** 39,43 ****
  };
  
! class RCS_EXPORT RCS_LINKED_LIST_NODE
  {
  public:
--- 33,37 ----
  };
  
! class RCS_LINKED_LIST_NODE
  {
  public:
***************
*** 53,57 ****
  };
  
! class RCS_EXPORT RCS_LINKED_LIST
  {
  protected:
--- 47,51 ----
  };
  
! class RCS_LINKED_LIST
  {
  protected:

[Emc-commit] rcslib/src/os_intf _timer.h,4.33,4.33.2.1 inetfile.hh,4.32,4.32.2.1 inifile.h,4.33,4.33.2.1 rcs_exit.hh,4.33,4.33.2.1 timer.hh,4.35,4.35.2.1

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

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

Modified Files:
      Tag: wps_multiplat_dev_branch
	_timer.h inetfile.hh inifile.h rcs_exit.hh timer.hh 
Log Message:
.

Index: _timer.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/_timer.h,v
retrieving revision 4.33
retrieving revision 4.33.2.1
diff -C2 -d -r4.33 -r4.33.2.1
*** _timer.h	6 Sep 2001 14:32:55 -0000	4.33
--- _timer.h	22 Aug 2003 20:06:37 -0000	4.33.2.1
***************
*** 3,8 ****
  #define _TIMER_H
  
- #include "rcs_defs.hh"		/* RCS_EXPORT */
- 
  /* Useful time routines */
  
--- 3,6 ----
***************
*** 15,22 ****
  
  /* number of seconds from standard epoch, to clock tick resolution */
!   extern double RCS_EXPORT etime (void);
  
  /* sleeps # of seconds, to clock tick resolution */
!   extern void RCS_EXPORT esleep (double secs);
  
  
--- 13,20 ----
  
  /* number of seconds from standard epoch, to clock tick resolution */
!   extern double  etime (void);
  
  /* sleeps # of seconds, to clock tick resolution */
!   extern void  esleep (double secs);
  
  

Index: inetfile.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/inetfile.hh,v
retrieving revision 4.32
retrieving revision 4.32.2.1
diff -C2 -d -r4.32 -r4.32.2.1
*** inetfile.hh	6 May 2003 15:18:21 -0000	4.32
--- inetfile.hh	22 Aug 2003 20:06:37 -0000	4.32.2.1
***************
*** 4,8 ****
  #define INETFILE_HH
  
- #include "rcs_defs.hh"
  
  #ifdef __cplusplus
--- 4,7 ----
***************
*** 17,27 ****
  #endif
  
!   int RCS_EXPORT inet_file_init (const char *, char *, int debug);
!   RCS_EXPORT int inet_file_exit ();
!   RCS_EXPORT INET_FILE *inet_file_open (const char *url, char *);
!   RCS_EXPORT int inet_file_close (INET_FILE *);
!   RCS_EXPORT char *inet_file_gets (char *, int, INET_FILE *);
!   RCS_EXPORT int inet_file_eof (INET_FILE *);
!   int RCS_EXPORT inet_file_rewind (INET_FILE *);
  
  
--- 16,26 ----
  #endif
  
!   int inet_file_init (const char *, char *, int debug);
!   int inet_file_exit ();
!   INET_FILE *inet_file_open (const char *url, char *);
!   int inet_file_close (INET_FILE *);
!   char *inet_file_gets (char *, int, INET_FILE *);
!   int inet_file_eof (INET_FILE *);
!   int inet_file_rewind (INET_FILE *);
  
  

Index: inifile.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/inifile.h,v
retrieving revision 4.33
retrieving revision 4.33.2.1
diff -C2 -d -r4.33 -r4.33.2.1
*** inifile.h	6 May 2003 15:18:21 -0000	4.33
--- inifile.h	22 Aug 2003 20:06:37 -0000	4.33.2.1
***************
*** 14,19 ****
  */
  
- #include "rcs_defs.hh"
- 
  #if (!defined(MSDOS) || defined(WIN32)) && !defined(linux)
  #ifdef INIFILE_USE_INET_FILES
--- 14,17 ----

Index: rcs_exit.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/rcs_exit.hh,v
retrieving revision 4.33
retrieving revision 4.33.2.1
diff -C2 -d -r4.33 -r4.33.2.1
*** rcs_exit.hh	6 Sep 2001 14:32:55 -0000	4.33
--- rcs_exit.hh	22 Aug 2003 20:06:37 -0000	4.33.2.1
***************
*** 4,9 ****
  #define RCS_EXIT_HH
  
- #include "rcs_defs.hh"		// RCS_EXPORT
- 
  #ifdef __cplusplus
  extern "C"
--- 4,7 ----
***************
*** 16,25 ****
  // argument of a function.
  #ifdef VXWORKS
!   int RCS_EXPORT attach_rcs_exit_list (void *);
  #else
!   int RCS_EXPORT attach_rcs_exit_list (void (*fptr) (int));
  #endif
!   void RCS_EXPORT rcs_cleanup (int code);
!   void RCS_EXPORT rcs_exit (int code);
  
  #ifdef __cplusplus
--- 14,23 ----
  // argument of a function.
  #ifdef VXWORKS
!   int attach_rcs_exit_list (void *);
  #else
!   int attach_rcs_exit_list (void (*fptr) (int));
  #endif
!   void rcs_cleanup (int code);
!   void rcs_exit (int code);
  
  #ifdef __cplusplus

Index: timer.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/timer.hh,v
retrieving revision 4.35
retrieving revision 4.35.2.1
diff -C2 -d -r4.35 -r4.35.2.1
*** timer.hh	30 Jan 2003 20:21:42 -0000	4.35
--- timer.hh	22 Aug 2003 20:06:37 -0000	4.35.2.1
***************
*** 2,22 ****
  #ifndef TIMER_HH
  #define TIMER_HH
- #include "rcs_defs.hh"		/* RCS_EXPORT */
- 
- 
- extern "C"
- {
- #ifndef NO_STDIO
- #include <stdio.h>		/* NULL */
- #endif
- }
  
  extern "C"
  {
    /* number of seconds from standard epoch, to clock tick resolution */
!   extern double RCS_EXPORT etime (void);
  
    /* sleeps # of seconds, to clock tick resolution */
!   extern void RCS_EXPORT esleep (double secs);
  }
  
--- 2,13 ----
  #ifndef TIMER_HH
  #define TIMER_HH
  
  extern "C"
  {
    /* number of seconds from standard epoch, to clock tick resolution */
!   extern double  etime (void);
  
    /* sleeps # of seconds, to clock tick resolution */
!   extern void  esleep (double secs);
  }
  
***************
*** 35,39 ****
  /* prototype for user-defined timing function */
  #ifndef sparcworks
! typedef int (*RCS_TIMERFUNC) (void *_arg = NULL);
  #else
  typedef int (*RCS_TIMERFUNC) (void *_arg);
--- 26,30 ----
  /* prototype for user-defined timing function */
  #ifndef sparcworks
! typedef int (*RCS_TIMERFUNC) (void *_arg = 0);
  #else
  typedef int (*RCS_TIMERFUNC) (void *_arg);
***************
*** 69,85 ****
    obtain a time in system clock ticks from creation of the timer.
    */
! class RCS_EXPORT RCS_TIMER
  {
  public:
! /* Getting rid of this stuff which noone uses and makes porting more
! difficult */
    RCS_TIMER (double timeout, RCS_TIMERFUNC function =
! 	     (RCS_TIMERFUNC) NULL, void *arg = NULL);
  
!     RCS_TIMER (char *process_name, char *timer_config_file);
!     RCS_TIMER (double _timeout, char *process_name, char *timer_config_file);
    /* timeout is wait interval, rounded up to clock tick resolution;
       function is external time base, if provided */
!    ~RCS_TIMER ();
    int wait ();			/* wait on synch; returns # of cycles missed */
    double load ();		/* returns % loading on timer, 0.0 means
--- 60,75 ----
    obtain a time in system clock ticks from creation of the timer.
    */
! class  RCS_TIMER
  {
  public:
! 
    RCS_TIMER (double timeout, RCS_TIMERFUNC function =
! 	     (RCS_TIMERFUNC) 0, void *arg = 0);
  
!   RCS_TIMER (char *process_name, char *timer_config_file);
!   RCS_TIMER (double _timeout, char *process_name, char *timer_config_file);
    /* timeout is wait interval, rounded up to clock tick resolution;
       function is external time base, if provided */
!   ~RCS_TIMER ();
    int wait ();			/* wait on synch; returns # of cycles missed */
    double load ();		/* returns % loading on timer, 0.0 means

[Emc-commit] rcslib/src/java/rcs RCS_VERSION.java,4.46.2.1,4.46.2.2

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

Update of /cvsroot/emc/rcslib/src/java/rcs
In directory sc8-pr-cvs1:/tmp/cvs-serv3769/src/java/rcs

Modified Files:
      Tag: wps_multiplat_dev_branch
	RCS_VERSION.java 
Log Message:
.

Index: RCS_VERSION.java
===================================================================
RCS file: /cvsroot/emc/rcslib/src/java/rcs/RCS_VERSION.java,v
retrieving revision 4.46.2.1
retrieving revision 4.46.2.2
diff -C2 -d -r4.46.2.1 -r4.46.2.2
*** RCS_VERSION.java	8 Aug 2003 14:21:12 -0000	4.46.2.1
--- RCS_VERSION.java	22 Aug 2003 20:06:37 -0000	4.46.2.2
***************
*** 2,6 ****
  * Provides a means for Java Applications to check the version of the
  * RCS Library being used.
! * The install_rcs script uses sed to replace 2003.6 in
  * RCS_VERSION.java.perm  --> RCS_VERSION.java
  * file with the appropriate version number. This is to provide consistency
--- 2,6 ----
  * Provides a means for Java Applications to check the version of the
  * RCS Library being used.
! * The install_rcs script uses sed to replace 2003.8 in
  * RCS_VERSION.java.perm  --> RCS_VERSION.java
  * file with the appropriate version number. This is to provide consistency
***************
*** 34,45 ****
  {
          /**
!         * String in which the version number 2003.6 is stored.
          */
!         public static final String version_string =  "2003.6";
  
          /**
          * String in which the library was compiled is stored.
          */
!         public static final String date_string =  "Mon Jul 28 14:29:54 EDT 2003";
  
          /**
--- 34,45 ----
  {
          /**
!         * String in which the version number 2003.8 is stored.
          */
!         public static final String version_string =  "2003.8";
  
          /**
          * String in which the library was compiled is stored.
          */
!         public static final String date_string =  "Fri Aug 22 13:45:26 EDT 2003";
  
          /**
***************
*** 47,51 ****
          * and compile date etc. is stored.
          */
!         public static final String info_string = "@(#)" + " RCS_LIBRARY_VERSION: " + 2003.6 + " Compiled on  "+ "Mon Jul 28 14:29:54 EDT 2003"+ " for the java platform.\n";
  
          /**
--- 47,51 ----
          * and compile date etc. is stored.
          */
!         public static final String info_string = "@(#)" + " RCS_LIBRARY_VERSION: " + 2003.8 + " Compiled on  "+ "Fri Aug 22 13:45:26 EDT 2003"+ " for the java platform.\n";
  
          /**

[Emc-commit] rcslib Makefile.am,1.7.2.8,1.7.2.9 Makefile.in,1.7.2.8,1.7.2.9 configure,1.3.2.5,1.3.2.6 configure.ac,1.3.2.4,1.3.2.5

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

Update of /cvsroot/emc/rcslib
In directory sc8-pr-cvs1:/tmp/cvs-serv3769

Modified Files:
      Tag: wps_multiplat_dev_branch
	Makefile.am Makefile.in configure configure.ac 
Log Message:
.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/emc/rcslib/Makefile.am,v
retrieving revision 1.7.2.8
retrieving revision 1.7.2.9
diff -C2 -d -r1.7.2.8 -r1.7.2.9
*** Makefile.am	22 Aug 2003 03:34:26 -0000	1.7.2.8
--- Makefile.am	22 Aug 2003 20:06:35 -0000	1.7.2.9
***************
*** 118,122 ****
  TESTS=etc/testnml.sh
  
! librcs_la_LDFLAGS=-release 5.2
  
  librcs_la_LIBADD= @LTLIBOBJS@
--- 118,122 ----
  TESTS=etc/testnml.sh
  
! librcs_la_LDFLAGS=-release 2003.8
  
  librcs_la_LIBADD= @LTLIBOBJS@
***************
*** 193,197 ****
  
  
! include_HEADERS=src/rcs.hh src/rcs_defs.hh \
  	src/print/rcs_prnt.hh src/stg_clss/linklist.hh src/cms/nmlmsg.hh \
  	src/cms/nml.hh src/cms/cms_user.hh src/cms/cms.hh src/cms/cms_cfg.hh \
--- 193,197 ----
  
  
! include_HEADERS=src/rcs.hh \
  	src/print/rcs_prnt.hh src/stg_clss/linklist.hh src/cms/nmlmsg.hh \
  	src/cms/nml.hh src/cms/cms_user.hh src/cms/cms.hh src/cms/cms_cfg.hh \
***************
*** 199,206 ****
  	src/node/stat_msg.hh src/node/wm_msg.hh src/node/nml_oi.hh \
  	src/cms/cmsdiag.hh src/cms/nmldiag.hh src/cms/cms_srv.hh \
! 	src/cms/sokintrf.h src/cms/rem_msg.hh src/cms/nml_srv.hh \
! 	src/os_intf/timer.hh src/os_intf/rcs_exit.hh src/os_intf/inetfile.hh \
  	src/os_intf/inifile.h src/node/nml_mod.hh src/cms/nmlqr.hh \
! 	src/rcsvers.hh src/os_intf/_shm.h src/os_intf/_timer.h \
  	src/cms/ttyintf.h
  
--- 199,206 ----
  	src/node/stat_msg.hh src/node/wm_msg.hh src/node/nml_oi.hh \
  	src/cms/cmsdiag.hh src/cms/nmldiag.hh src/cms/cms_srv.hh \
! 	src/cms/rem_msg.hh src/cms/nml_srv.hh \
! 	src/os_intf/timer.hh src/os_intf/rcs_exit.hh \
  	src/os_intf/inifile.h src/node/nml_mod.hh src/cms/nmlqr.hh \
! 	src/rcsvers.hh  src/os_intf/_timer.h \
  	src/cms/ttyintf.h
  

Index: Makefile.in
===================================================================
RCS file: /cvsroot/emc/rcslib/Makefile.in,v
retrieving revision 1.7.2.8
retrieving revision 1.7.2.9
diff -C2 -d -r1.7.2.8 -r1.7.2.9
*** Makefile.in	22 Aug 2003 03:34:26 -0000	1.7.2.8
--- Makefile.in	22 Aug 2003 20:06:35 -0000	1.7.2.9
***************
*** 212,216 ****
  TESTS = etc/testnml.sh
  
! librcs_la_LDFLAGS = -release 5.2
  
  librcs_la_LIBADD = @LTLIBOBJS@
--- 212,216 ----
  TESTS = etc/testnml.sh
  
! librcs_la_LDFLAGS = -release 2003.8
  
  librcs_la_LIBADD = @LTLIBOBJS@
***************
*** 283,287 ****
  
  
! include_HEADERS = src/rcs.hh src/rcs_defs.hh \
  	src/print/rcs_prnt.hh src/stg_clss/linklist.hh src/cms/nmlmsg.hh \
  	src/cms/nml.hh src/cms/cms_user.hh src/cms/cms.hh src/cms/cms_cfg.hh \
--- 283,287 ----
  
  
! include_HEADERS = src/rcs.hh \
  	src/print/rcs_prnt.hh src/stg_clss/linklist.hh src/cms/nmlmsg.hh \
  	src/cms/nml.hh src/cms/cms_user.hh src/cms/cms.hh src/cms/cms_cfg.hh \
***************
*** 289,296 ****
  	src/node/stat_msg.hh src/node/wm_msg.hh src/node/nml_oi.hh \
  	src/cms/cmsdiag.hh src/cms/nmldiag.hh src/cms/cms_srv.hh \
! 	src/cms/sokintrf.h src/cms/rem_msg.hh src/cms/nml_srv.hh \
! 	src/os_intf/timer.hh src/os_intf/rcs_exit.hh src/os_intf/inetfile.hh \
  	src/os_intf/inifile.h src/node/nml_mod.hh src/cms/nmlqr.hh \
! 	src/rcsvers.hh src/os_intf/_shm.h src/os_intf/_timer.h \
  	src/cms/ttyintf.h
  
--- 289,296 ----
  	src/node/stat_msg.hh src/node/wm_msg.hh src/node/nml_oi.hh \
  	src/cms/cmsdiag.hh src/cms/nmldiag.hh src/cms/cms_srv.hh \
! 	src/cms/rem_msg.hh src/cms/nml_srv.hh \
! 	src/os_intf/timer.hh src/os_intf/rcs_exit.hh \
  	src/os_intf/inifile.h src/node/nml_mod.hh src/cms/nmlqr.hh \
! 	src/rcsvers.hh  src/os_intf/_timer.h \
  	src/cms/ttyintf.h
  

Index: configure
===================================================================
RCS file: /cvsroot/emc/rcslib/configure,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -C2 -d -r1.3.2.5 -r1.3.2.6
*** configure	22 Aug 2003 03:34:26 -0000	1.3.2.5
--- configure	22 Aug 2003 20:06:35 -0000	1.3.2.6
***************
*** 1,5 ****
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.53 for Real-Time Control System Library 2003.6 .
  #
  # Report bugs to <sh...@cm...>.
--- 1,5 ----
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.53 for Real-Time Control System Library 2003.8 .
  #
  # Report bugs to <sh...@cm...>.
***************
*** 416,421 ****
  PACKAGE_NAME='Real-Time Control System Library'
  PACKAGE_TARNAME='rcslib'
! PACKAGE_VERSION='2003.6 '
! PACKAGE_STRING='Real-Time Control System Library 2003.6 '
  PACKAGE_BUGREPORT='sh...@cm...'
  
--- 416,421 ----
  PACKAGE_NAME='Real-Time Control System Library'
  PACKAGE_TARNAME='rcslib'
! PACKAGE_VERSION='2003.8 '
! PACKAGE_STRING='Real-Time Control System Library 2003.8 '
  PACKAGE_BUGREPORT='sh...@cm...'
  
***************
*** 934,938 ****
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<_ACEOF
! \`configure' configures Real-Time Control System Library 2003.6  to adapt to many kinds of systems.
  
  Usage: $0 [OPTION]... [VAR=VALUE]...
--- 934,938 ----
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<_ACEOF
! \`configure' configures Real-Time Control System Library 2003.8  to adapt to many kinds of systems.
  
  Usage: $0 [OPTION]... [VAR=VALUE]...
***************
*** 1000,1004 ****
  if test -n "$ac_init_help"; then
    case $ac_init_help in
!      short | recursive ) echo "Configuration of Real-Time Control System Library 2003.6 :";;
     esac
    cat <<\_ACEOF
--- 1000,1004 ----
  if test -n "$ac_init_help"; then
    case $ac_init_help in
!      short | recursive ) echo "Configuration of Real-Time Control System Library 2003.8 :";;
     esac
    cat <<\_ACEOF
***************
*** 1009,1012 ****
--- 1009,1014 ----
    --enable-maintainer-mode enable make rules and dependencies not useful
                            (and sometimes confusing) to the casual installer
+   --enable-ALL            Enable/Disable all of the above in one command.
+                           (default=no)
    --enable-nml-codegen    Build the nml_codegen tool also enables
                            librcsforgcj. It requires GCJ.(default=no)
***************
*** 1055,1060 ****
                            compatibility and simpler linking. (default=yes)
    --enable-xsd2nmlh       Build the xsd2nmlh program. (default=yes)
-   --enable-ALL            Enable/Disable all of the above in one command.
-                           (default=no)
    --disable-dependency-tracking Speeds up one-time builds
    --enable-dependency-tracking  Do not reject slow dependency extractors
--- 1057,1060 ----
***************
*** 1073,1077 ****
    --with-rtl-rtai         Check for rtl or rtai and provide support if found.
                            (default=no)
!   --with-librt            Check for librt and use if found. (default=yes)
    --with-posix_threads    Check for POSIX threads and use if found.
                            (default=yes)
--- 1073,1079 ----
    --with-rtl-rtai         Check for rtl or rtai and provide support if found.
                            (default=no)
!   --with-librt            Check for librt and use if found. On some systems it
!                           provides clock_gettime() which may be more accurate
!                           than gettimeofday(). (default=yes)
    --with-posix_threads    Check for POSIX threads and use if found.
                            (default=yes)
***************
*** 1157,1161 ****
  if $ac_init_version; then
    cat <<\_ACEOF
! Real-Time Control System Library configure 2003.6
  generated by GNU Autoconf 2.53
  
--- 1159,1163 ----
  if $ac_init_version; then
    cat <<\_ACEOF
! Real-Time Control System Library configure 2003.8
  generated by GNU Autoconf 2.53
  
***************
*** 1172,1176 ****
  running configure, to aid debugging if configure makes a mistake.
  
! It was created by Real-Time Control System Library $as_me 2003.6 , which was
  generated by GNU Autoconf 2.53.  Invocation command line was
  
--- 1174,1178 ----
  running configure, to aid debugging if configure makes a mistake.
  
! It was created by Real-Time Control System Library $as_me 2003.8 , which was
  generated by GNU Autoconf 2.53.  Invocation command line was
  
***************
*** 1704,1708 ****
  # Define the identity of the package.
   PACKAGE=rcslib
!  VERSION=2003.6
  
  
--- 1706,1710 ----
  # Define the identity of the package.
   PACKAGE=rcslib
!  VERSION=2003.8
  
  
***************
*** 1935,1938 ****
--- 1937,1947 ----
  
  
+ # Check whether --enable-ALL or --disable-ALL was given.
+ if test "${enable_ALL+set}" = set; then
+   enableval="$enable_ALL"
+   enable_nml_codegen=${enableval};enable_rcs_jar=${enableval};enable_codegen_jar=${enableval};enable_diagapplet_jar=${enableval};enable_filemem=${enableval};enable_xml=${enableval};enable_xdr=${enableval};enable_disp=${enableval};enable_diag=${enableval};enable_print=${enableval};enable_nmlqr=${enableval};enable_xsd2nmlh=${enableval};enable_locmem=${enableval};enable_phantom=${enableval};enable_shmem=${enableval};enable_stcp=${enableval};enable_tcp=${enableval};enable_udp=${enableval};enable_tty=${enableval};enable_crypt=${enableval};enable_http=${enableval};enable_posemath_in_rcslib=${enableval};enable_nmlmod_in_rcslib=${enableval};enable_server=${enableval};enable_sokintrf=${enable_val};enable_rtlmem=${enableval}
+ fi;
+ 
+ 
  # Check whether --enable-nml_codegen or --disable-nml_codegen was given.
  if test "${enable_nml_codegen+set}" = set; then
***************
*** 2233,2244 ****
  
  
- # Check whether --enable-ALL or --disable-ALL was given.
- if test "${enable_ALL+set}" = set; then
-   enableval="$enable_ALL"
-   enable_nml_codegen=${enableval};enable_rcs_jar=${enableval};enable_codegen_jar=${enableval};enable_diagapplet_jar=${enableval};enable_filemem=${enableval};enable_xml=${enableval};enable_xdr=${enableval};enable_disp=${enableval};enable_diag=${enableval};enable_print=${enableval};enable_nmlqr=${enableval};enable_xsd2nmlh=${enableval};enable_locmem=${enableval};enable_phantom=${enableval};enable_shmem=${enableval};enable_stcp=${enableval};enable_tcp=${enableval};enable_udp=${enableval};enable_tty=${enableval};enable_crypt=${enableval};enable_http=${enableval};enable_posemath_in_rcslib=${enableval};enable_nmlmod_in_rcslib=${enableval};enable_server=${enableval};enable_sokintrf=${enable_val};enable_rtlmem=${enableval}
- fi;
  
  if test "x${enable_xsd2nmlh}" = "xyes" ; then
!    CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} 'xsd2nmlh$(EXEEXT)'"
     ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS=${CONFIGURED_PROGRAMS}])
  fi
--- 2242,2248 ----
  
  
  
  if test "x${enable_xsd2nmlh}" = "xyes" ; then
!    CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} "'xsd2nmlh$(EXEEXT)'
     ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS=${CONFIGURED_PROGRAMS}])
  fi
***************
*** 5168,5172 ****
  *-*-irix6*)
    # Find out which ABI we are using.
!   echo '#line 5170 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
--- 5172,5176 ----
  *-*-irix6*)
    # Find out which ABI we are using.
!   echo '#line 5174 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
***************
*** 5704,5708 ****
  CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
  compiler_c_o=no
! if { (eval echo configure:5706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
    # The compiler can only warn and ignore the option if not recognized
    # So say no if there are warnings
--- 5708,5712 ----
  CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
  compiler_c_o=no
! if { (eval echo configure:5710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
    # The compiler can only warn and ignore the option if not recognized
    # So say no if there are warnings
***************
*** 7497,7501 ****
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 7499 "configure"
  #include "confdefs.h"
  
--- 7501,7505 ----
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 7503 "configure"
  #include "confdefs.h"
  
***************
*** 7595,7599 ****
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 7597 "configure"
  #include "confdefs.h"
  
--- 7599,7603 ----
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 7601 "configure"
  #include "confdefs.h"
  
***************
*** 9047,9051 ****
        ## AC_MSG_NOTICE([GCJ : ${GCJ}])
        ## AC_MSG_NOTICE([GCJFLAGS : ${GCJFLAGS}])
!       CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} 'nml_codegen$(EXEEXT)'";
        ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
  
--- 9051,9055 ----
        ## AC_MSG_NOTICE([GCJ : ${GCJ}])
        ## AC_MSG_NOTICE([GCJFLAGS : ${GCJFLAGS}])
!       CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} "'nml_codegen$(EXEEXT)';
        ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
  
***************
*** 17522,17526 ****
  cat >&5 <<_CSEOF
  
! This file was extended by Real-Time Control System Library $as_me 2003.6 , which was
  generated by GNU Autoconf 2.53.  Invocation command line was
  
--- 17526,17530 ----
  cat >&5 <<_CSEOF
  
! This file was extended by Real-Time Control System Library $as_me 2003.8 , which was
  generated by GNU Autoconf 2.53.  Invocation command line was
  
***************
*** 17584,17588 ****
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
! Real-Time Control System Library config.status 2003.6
  configured by $0, generated by GNU Autoconf 2.53,
    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
--- 17588,17592 ----
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
! Real-Time Control System Library config.status 2003.8
  configured by $0, generated by GNU Autoconf 2.53,
    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

Index: configure.ac
===================================================================
RCS file: /cvsroot/emc/rcslib/configure.ac,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -C2 -d -r1.3.2.4 -r1.3.2.5
*** configure.ac	22 Aug 2003 03:34:26 -0000	1.3.2.4
--- configure.ac	22 Aug 2003 20:06:36 -0000	1.3.2.5
***************
*** 1,4 ****
  # Process this file with autoconf to produce a configure script.
! AC_INIT(Real-Time Control System Library, 2003.6 , sh...@cm..., rcslib)
  AM_INIT_AUTOMAKE
  AC_CONFIG_SRCDIR([src/rcs.hh])
--- 1,4 ----
  # Process this file with autoconf to produce a configure script.
! AC_INIT(Real-Time Control System Library, 2003.8 , sh...@cm..., rcslib)
  AM_INIT_AUTOMAKE
  AC_CONFIG_SRCDIR([src/rcs.hh])
***************
*** 43,47 ****
  AC_ARG_WITH(librt,
  	[AC_HELP_STRING([--with-librt],
! 	[Check for librt and use if found. (default=yes)])],
  	[with_librt=$withval;
  	AC_MSG_NOTICE([with_librt=${with_librt}])],
--- 43,47 ----
  AC_ARG_WITH(librt,
  	[AC_HELP_STRING([--with-librt],
! 	[Check for librt and use if found. On some systems it provides clock_gettime() which may be more accurate than gettimeofday(). (default=yes)])],
  	[with_librt=$withval;
  	AC_MSG_NOTICE([with_librt=${with_librt}])],
***************
*** 58,61 ****
--- 58,67 ----
  
  
+ AC_ARG_ENABLE(ALL,
+ 	[AC_HELP_STRING([--enable-ALL],
+ 	[Enable/Disable all of the above in one command. (default=no)])],
+ 	[enable_nml_codegen=${enableval};enable_rcs_jar=${enableval};enable_codegen_jar=${enableval};enable_diagapplet_jar=${enableval};enable_filemem=${enableval};enable_xml=${enableval};enable_xdr=${enableval};enable_disp=${enableval};enable_diag=${enableval};enable_print=${enableval};enable_nmlqr=${enableval};enable_xsd2nmlh=${enableval};enable_locmem=${enableval};enable_phantom=${enableval};enable_shmem=${enableval};enable_stcp=${enableval};enable_tcp=${enableval};enable_udp=${enableval};enable_tty=${enableval};enable_crypt=${enableval};enable_http=${enableval};enable_posemath_in_rcslib=${enableval};enable_nmlmod_in_rcslib=${enableval};enable_server=${enableval};enable_sokintrf=${enable_val};enable_rtlmem=${enableval}])
+ 
+ 
  AC_ARG_ENABLE(nml_codegen,
  	[AC_HELP_STRING([--enable-nml-codegen],
***************
*** 278,288 ****
  
  
- AC_ARG_ENABLE(ALL,
- 	[AC_HELP_STRING([--enable-ALL],
- 	[Enable/Disable all of the above in one command. (default=no)])],
- 	[enable_nml_codegen=${enableval};enable_rcs_jar=${enableval};enable_codegen_jar=${enableval};enable_diagapplet_jar=${enableval};enable_filemem=${enableval};enable_xml=${enableval};enable_xdr=${enableval};enable_disp=${enableval};enable_diag=${enableval};enable_print=${enableval};enable_nmlqr=${enableval};enable_xsd2nmlh=${enableval};enable_locmem=${enableval};enable_phantom=${enableval};enable_shmem=${enableval};enable_stcp=${enableval};enable_tcp=${enableval};enable_udp=${enableval};enable_tty=${enableval};enable_crypt=${enableval};enable_http=${enableval};enable_posemath_in_rcslib=${enableval};enable_nmlmod_in_rcslib=${enableval};enable_server=${enableval};enable_sokintrf=${enable_val};enable_rtlmem=${enableval}])
  
  if test "x${enable_xsd2nmlh}" = "xyes" ; then
!    CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} 'xsd2nmlh$(EXEEXT)'"
     ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS=${CONFIGURED_PROGRAMS}])
  fi
--- 284,290 ----
  
  
  
  if test "x${enable_xsd2nmlh}" = "xyes" ; then
!    CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} "'xsd2nmlh$(EXEEXT)'
     ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS=${CONFIGURED_PROGRAMS}])
  fi
***************
*** 555,559 ****
        ## AC_MSG_NOTICE([GCJ : ${GCJ}])
        ## AC_MSG_NOTICE([GCJFLAGS : ${GCJFLAGS}])
!       CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} 'nml_codegen$(EXEEXT)'";
        ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
  
--- 557,561 ----
        ## AC_MSG_NOTICE([GCJ : ${GCJ}])
        ## AC_MSG_NOTICE([GCJFLAGS : ${GCJFLAGS}])
!       CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} "'nml_codegen$(EXEEXT)';
        ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
  

[Emc-commit] rcslib/etc multiplatbuild.sh,1.1.2.3,1.1.2.4

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

Update of /cvsroot/emc/rcslib/etc
In directory sc8-pr-cvs1:/tmp/cvs-serv3769/etc

Modified Files:
      Tag: wps_multiplat_dev_branch
	multiplatbuild.sh 
Log Message:
.

Index: multiplatbuild.sh
===================================================================
RCS file: /cvsroot/emc/rcslib/etc/Attic/multiplatbuild.sh,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** multiplatbuild.sh	22 Aug 2003 03:34:26 -0000	1.1.2.3
--- multiplatbuild.sh	22 Aug 2003 20:06:36 -0000	1.1.2.4
***************
*** 67,70 ****
--- 67,74 ----
  done
  
+ if test -f ${HOME}/.rebuild_rcslib_configure ; then
+     REBUILD_RCSLIB_CONFIGURE=yes
+ fi
+ 
  (# set -x ; 
  if test "x${REBUILD_RCSLIB_CONFIGURE}" = "xyes" ; then
***************
*** 76,85 ****
--- 80,98 ----
  
      if test ${rcsdir}/Makefile.in -ot ${rcsdir}/Makefile.am ; then
+ 	  ls -l ${rcsdir}/Makefile.in
+ 	  ls -l ${rcsdir}/Makefile.am
  	 (cd ${rcsdir} ; set -x ; automake || (echo "automake failed." >&2 ; exit 1 ) || exit 1) || exit 1;
+ 	 ls -l ${rcsdir}/Makefile.in
+ 	 touch ${rcsdir}/Makefile.in
+ 	 ls -l ${rcsdir}/Makefile.in
+ 	 
      fi
  
      if test ${rcsdir}/rcs_config.h.in  -ot ${rcsdir}/configure.ac ; then
+ 	ls -l ${rcsdir}/rcs_config.h.in
+ 	ls -l ${rcsdir}/configure.ac
  	(set -x ; autoheader || (echo "autoheader failed." >&2 ; exit 1 ) || exit 1) || exit 1;
  	touch ${rcsdir}/rcs_config.h.in
+ 	ls -l ${rcsdir}/rcs_config.h.in
      fi
  
***************
*** 90,94 ****
--- 103,116 ----
  	${rcsdir}/configure -ot ${rcsdir}/rcs_config.h.in ; then
  	
+ 	ls -l ${rcsdir}/configure
+ 	ls -l ${rcsdir}/aclocal.m4
+ 	ls -l ${rcsdir}/Makefile.in
+ 	ls -l ${rcsdir}/configure.ac
+ 	ls -l ${rcsdir}/rcs_config.h.in
+ 
  	(cd ${rcsdir} ; set -x ; autoconf || (echo "autoconf failed." ; exit 1 ) || exit 1) || exit 1;
+ 	ls -l ${rcsdir}/configure
+ 	touch ${rcsdir}/configure
+ 	ls -l ${rcsdir}/configure	
      fi
  fi
***************
*** 135,139 ****
  
  echo "install_dir=${install_dir}" >&2
! if test ! -d ${install_dir} ; then 
      mkdir -p ${install_dir} || (echo "mkdir -p ${install_dir}  failed." >&2 ; exit 127 ) || exit 127
  fi
--- 157,161 ----
  
  echo "install_dir=${install_dir}" >&2
! if test '!' -d ${install_dir} ; then 
      mkdir -p ${install_dir} || (echo "mkdir -p ${install_dir}  failed." >&2 ; exit 127 ) || exit 127
  fi
***************
*** 147,151 ****
  
  echo "build_dir=${build_dir}" >&2
! if test ! -d ${build_dir} ; then
      mkdir -p ${build_dir} || (echo "mkdir -p ${build_dir} failed." >&2 ; exit 127 )
  fi
--- 169,173 ----
  
  echo "build_dir=${build_dir}" >&2
! if test '!' -d ${build_dir} ; then
      mkdir -p ${build_dir} || (echo "mkdir -p ${build_dir} failed." >&2 ; exit 127 )
  fi
***************
*** 153,156 ****
--- 175,203 ----
  cd ${build_dir} || (echo "cd ${build_dir} failed." >&2 ; exit 127 ) || exit 127
  
+ if test -f ${build_dir}/Makefile ; then
+ 
+     if test ${build_dir}/Makefile -ot ${rcsdir}/configure -o \
+ 	${build_dir}/Makefile -ot ${rcsdir}/configure.ac -o \
+ 	${build_dir}/Makefile -ot ${rcsdir}/Makefile.in -o \
+ 	${build_dir}/Makefile -ot ${rcsdir}/Makefile.am -o \
+ 	${build_dir}/libtool -ot ${rcsdir}/configure -o \
+ 	${build_dir}/libtool -ot ${rcsdir}/configure.ac -o \
+ 	${build_dir}/libtool -ot ${rcsdir}/Makefile.in -o \
+ 	${build_dir}/libtool -ot ${rcsdir}/Makefile.am -o \
+ 	${build_dir}/rcs_config.h -ot ${rcsdir}/configure -o \
+ 	${build_dir}/rcs_config.h -ot ${rcsdir}/configure.ac -o \
+ 	${build_dir}/rcs_config.h -ot ${rcsdir}/Makefile.in -o \
+ 	${build_dir}/rcs_config.h -ot ${rcsdir}/rcs_config.h.in -o \
+ 	${build_dir}/rcs_config.h -ot ${rcsdir}/Makefile.am -o \
+ 	${build_dir}/.deps -ot ${rcsdir}/configure -o \
+ 	${build_dir}/.deps -ot ${rcsdir}/configure.ac -o \
+ 	${build_dir}/.deps -ot ${rcsdir}/Makefile.in -o \
+ 	${build_dir}/.deps -ot ${rcsdir}/rcs_config.h.in -o \
+ 	${build_dir}/.deps -ot ${rcsdir}/Makefile.am ; then
+ 
+ 	(set -x ; cd ${build_dir} ; make distclean )
+     fi
+ fi
+ 
  if test "x${host_arg}" = "x" ; then
      PLAT=`(cd ${rcsdir}; mkdir_cmd=true; export mkdir_cmd;  . ${rcsdir}/etc/platname) 2>/dev/null`
***************
*** 260,267 ****
  fi
  
  if test $# -lt 1 ; then
  
!     if test ! -f Makefile -o Makefile -ot ${rcsdir}/configure ; then
! 	( set -x ; ${rcsdir}/configure --prefix=${install_dir} ${host_arg_to_add} ) || (echo "configure failed." >&2 ; exit 127 ) || exit 127 
  	\rm -f ${build_dir}/*.{a,la,so}
  	\rm -f ${build_dir}/.libs/*.{a,la,so}
--- 307,318 ----
  fi
  
+ if test -f ${HOME}/.rcslib_configure_options ; then
+     CONFIG_OPTS=`cat ${HOME}/.rcslib_configure_options`
+ fi
+ 
  if test $# -lt 1 ; then
  
!     if test '!' -f Makefile  ; then
! 	( set -x ; ${rcsdir}/configure --prefix=${install_dir} ${host_arg_to_add} ${CONFIG_OPTS} ) || (echo "configure failed." >&2 ; exit 127 ) || exit 127 
  	\rm -f ${build_dir}/*.{a,la,so}
  	\rm -f ${build_dir}/.libs/*.{a,la,so}
***************
*** 271,275 ****
  
  elif test  "x${1}" = "xconfig" ; then
!     ( set -x ; 
      ${rcsdir}/configure --prefix=${install_dir} ${host_arg_to_add} $2 $3 $4 $5 ) || (echo "configure failed." >&2 ; exit 127 ) || exit 127
      \rm -f ${build_dir}/*.{a,la,so}
--- 322,330 ----
  
  elif test  "x${1}" = "xconfig" ; then
!     if test -f Makefile ; then
! 	make distclean 
!     fi
!     echo $2 $3 $4 $5 > ${HOME}/.rcslib_configure_options
!     ( set -x ;
      ${rcsdir}/configure --prefix=${install_dir} ${host_arg_to_add} $2 $3 $4 $5 ) || (echo "configure failed." >&2 ; exit 127 ) || exit 127
      \rm -f ${build_dir}/*.{a,la,so}
***************
*** 277,282 ****
  
  elif test  "x${1}" = "xmake" ; then
!     if test ! -f Makefile -o Makefile -ot ${rcsdir}/configure ; then
! 	( set -x ; ${rcsdir}/configure --prefix=${install_dir} ${host_arg_to_add} ) || (echo "configure failed." >&2 ; exit 127 ) || exit 127
  	\rm -f ${build_dir}/*.{a,la,so}
  	\rm -f ${build_dir}/.libs/*.{a,la,so}
--- 332,337 ----
  
  elif test  "x${1}" = "xmake" ; then
!     if test '!' -f Makefile; then
! 	( set -x ; ${rcsdir}/configure --prefix=${install_dir} ${host_arg_to_add} ${CONFIG_OPTS} ) || (echo "configure failed." >&2 ; exit 127 ) || exit 127
  	\rm -f ${build_dir}/*.{a,la,so}
  	\rm -f ${build_dir}/.libs/*.{a,la,so}
***************
*** 286,290 ****
  else
  
!     if test  ! -f Makefile -o Makefile -ot ${rcsdir}/configure  -a "xdistclean" != "x${1}" ; then
  	${rcsdir}/configure --prefix=${install_dir} || exit 127
      fi
--- 341,345 ----
  else
  
!     if test  ! -f Makefile  -a "xdistclean" != "x${1}" ; then
  	${rcsdir}/configure --prefix=${install_dir} || exit 127
      fi
***************
*** 295,299 ****
  fi
  
! if test ! -d ${rcsdir}/plat/java/lib ; then
      mkdir -p ${rcsdir}/plat/java/lib 2>/dev/null
  fi
--- 350,354 ----
  fi
  
! if test '!' -d ${rcsdir}/plat/java/lib ; then
      mkdir -p ${rcsdir}/plat/java/lib 2>/dev/null
  fi

[Emc-commit] rcslib/src rcs.hh,5.2.2.1,5.2.2.2 rcsvers.hh,5.1.2.1,5.1.2.2

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

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

Modified Files:
      Tag: wps_multiplat_dev_branch
	rcs.hh rcsvers.hh 
Log Message:
.

Index: rcs.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/rcs.hh,v
retrieving revision 5.2.2.1
retrieving revision 5.2.2.2
diff -C2 -d -r5.2.2.1 -r5.2.2.2
*** rcs.hh	8 Aug 2003 14:21:06 -0000	5.2.2.1
--- rcs.hh	22 Aug 2003 20:06:36 -0000	5.2.2.2
***************
*** 60,78 ****
  
  #if !defined(java) && !defined(rtlinux)
- /* Platform Specific Macros */
- #include "rcs_defs.hh"          /* __MSDOS__, RCS_FAR, RCS_EXPORT */
  
  /* Portable Print functions. */
  #include "rcs_prnt.hh"          /* rcs_print_ functions */
  
- /* MS-Windows functions to show output of rcs_print_ functions */
- #if defined(_WINDOWS) && !defined(gnuwin32)
- #include "win_prnt.hh"          /* create_rcs_print_window() */
- #endif
- 
  /* Linked Lists etc. */
  #include "linklist.hh"          /* class RCS_LINKED_LIST */
  
! /* Neutral Manufacturing Language (NML) */
  #include "nmlmsg.hh"            /* class NMLmsg */
  #include "nml.hh"               /* class NML */
--- 60,71 ----
  
  #if !defined(java) && !defined(rtlinux)
  
  /* Portable Print functions. */
  #include "rcs_prnt.hh"          /* rcs_print_ functions */
  
  /* Linked Lists etc. */
  #include "linklist.hh"          /* class RCS_LINKED_LIST */
  
! /* Neutral Messaging Language (NML) */
  #include "nmlmsg.hh"            /* class NMLmsg */
  #include "nml.hh"               /* class NML */
***************
*** 94,104 ****
  /* System Utilities. */
  #include "timer.hh"             /* class RCS_TIMER, etime(),esleep() */
- #include "rcs_exit.hh"          // rcs_exit(), attach_rcs_exit_list(),
- #include "inetfile.hh"          // inet_file_open(), inet_file_close()
  
  /* Pose/Vector/Matrix Math Classes */
  #include "posemath.h"
  
- 
  /* class INIFILE */
  #include "inifile.h"
--- 87,94 ----
***************
*** 135,137 ****
  #endif
  
! #endif                          /* !defined(RCS_HH) */
--- 125,128 ----
  #endif
  
! #endif                          
! /* !defined(RCS_HH) */

Index: rcsvers.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/rcsvers.hh,v
retrieving revision 5.1.2.1
retrieving revision 5.1.2.2
diff -C2 -d -r5.1.2.1 -r5.1.2.2
*** rcsvers.hh	8 Aug 2003 14:21:07 -0000	5.1.2.1
--- rcsvers.hh	22 Aug 2003 20:06:36 -0000	5.1.2.2
***************
*** 6,12 ****
  
  // Version Info
! #define RCS_VERSION "2003.6"
  #define RCS_MAJOR_VERSION (2003)
! #define RCS_MINOR_VERSION (6)
  
  
--- 6,12 ----
  
  // Version Info
! #define RCS_VERSION "2003.8"
  #define RCS_MAJOR_VERSION (2003)
! #define RCS_MINOR_VERSION (8)
  
  

[Emc-commit] rtapi/src/rtapi procfs_macros.h,NONE,1.1 rtapi.h,1.27,1.28 rtapi_common.h,1.2,1.3 rtapi_proc.h,1.2,1.3

[<pa...@us...>]

Update of /cvsroot/emc/rtapi/src/rtapi
In directory sc8-pr-cvs1:/tmp/cvs-serv31749

Modified Files:
	rtapi.h rtapi_common.h rtapi_proc.h 
Added Files:
	procfs_macros.h 
Log Message:
Small change for proc_fs macros

--- NEW FILE: procfs_macros.h ---
#ifndef PROCFS_MACROS_H
#define PROCFS_MACROS_H
/***********************************************************************
*                        PROC_FS MACROS                                *
************************************************************************/
#ifdef CONFIG_PROC_FS
#include <linux/proc_fs.h>

/* proc print macros - Contributed by: Erwin Rol (er...@mu...)
   and shamelessly ripped from rtai_proc_fs.h, part of the RTAI
   project.  See http://www.rtai.org for more details.

   macro that holds the local variables that
   we use in the PROC_PRINT_* macros. We have
   this macro so we can add variables with out
   changing the users of this macro, of course
   only when the names don't colide!
*/

#define PROC_PRINT_VARS                                 \
    off_t pos = 0;                                      \
    off_t begin = 0;                                    \
    int len = 0			/* no ";" */

/* macro that prints in the procfs read buffer.
   this macro expects the function arguments to be
   named as follows.
   static int FOO(char *page, char **start,
                off_t off, int count, int *eof, void *data)  */

#define PROC_PRINT(fmt,args...)                         \
    len += sprintf(page + len , fmt, ##args);           \
    pos += len;                                         \
    if(pos < off) {                                     \
        len = 0;                                        \
        begin = pos;                                    \
    }                                                   \
    if(pos > off + count)                               \
        goto done;

/* macro to leave the read function from another
   place than at the end.   */
#define PROC_PRINT_RETURN                              \
    *eof = 1;                                          \
    goto done			// no ";"

/* macro that should only used once at the end of the
   read function, to return from another place in the
   read function use the PROC_PRINT_RETURN macro.   */
#define PROC_PRINT_DONE                                 \
        *eof = 1;                                       \
    done:                                               \
        *start = page + (off - begin);                  \
        len -= (off - begin);                           \
        if(len > count)                                 \
            len = count;                                \
        if(len < 0)                                     \
            len = 0;                                    \
        return len		// no ";"

#endif		/* PROC_FS */
#endif		/* PROCFS_MACROS_H */

Index: rtapi.h
===================================================================
RCS file: /cvsroot/emc/rtapi/src/rtapi/rtapi.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** rtapi.h	20 Aug 2003 19:46:38 -0000	1.27
--- rtapi.h	22 Aug 2003 19:48:38 -0000	1.28
***************
*** 485,547 ****
  extern unsigned char rtapi_inb(unsigned int port);
  
- /***********************************************************************
- *                        PROC_FS MACROS                                *
- ************************************************************************/
- #ifdef CONFIG_PROC_FS
- /* Before using these macros, you MUST include linux/proc_fs.h
-    pior to rtapi.h */
- 
- /* proc print macros - Contributed by: Erwin Rol (er...@mu...)
-    and shamelessly ripped from rtai_proc_fs.h, part of the RTAI
-    project.  See http://www.rtai.org for more details.
- 
-    macro that holds the local variables that
-    we use in the PROC_PRINT_* macros. We have
-    this macro so we can add variables with out
-    changing the users of this macro, of course
-    only when the names don't colide!
- */
- 
- #define PROC_PRINT_VARS                                 \
-     off_t pos = 0;                                      \
-     off_t begin = 0;                                    \
-     int len = 0			/* no ";" */
- 
- /* macro that prints in the procfs read buffer.
-    this macro expects the function arguments to be
-    named as follows.
-    static int FOO(char *page, char **start,
-                 off_t off, int count, int *eof, void *data)  */
- 
- #define PROC_PRINT(fmt,args...)                         \
-     len += sprintf(page + len , fmt, ##args);           \
-     pos += len;                                         \
-     if(pos < off) {                                     \
-         len = 0;                                        \
-         begin = pos;                                    \
-     }                                                   \
-     if(pos > off + count)                               \
-         goto done;
- 
- /* macro to leave the read function from another
-    place than at the end.   */
- #define PROC_PRINT_RETURN                              \
-     *eof = 1;                                          \
-     goto done			// no ";"
- 
- /* macro that should only used once at the end of the
-    read function, to return from another place in the
-    read function use the PROC_PRINT_RETURN macro.   */
- #define PROC_PRINT_DONE                                 \
-         *eof = 1;                                       \
-     done:                                               \
-         *start = page + (off - begin);                  \
-         len -= (off - begin);                           \
-         if(len > count)                                 \
-             len = count;                                \
-         if(len < 0)                                     \
-             len = 0;                                    \
-         return len		// no ";"
- 
- 
  #endif /* RTAPI_H */
--- 485,487 ----

Index: rtapi_common.h
===================================================================
RCS file: /cvsroot/emc/rtapi/src/rtapi/rtapi_common.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rtapi_common.h	20 Aug 2003 03:16:21 -0000	1.2
--- rtapi_common.h	22 Aug 2003 19:48:38 -0000	1.3
***************
*** 53,61 ****
  /* These structs hold data associated with objects like tasks, etc. */
  
! typedef enum  { EMPTY = 0,
! 		PAUSED,
! 		PERIODIC,
! 		FREERUN,
! 		ENDED } task_state_t;
  
  typedef struct {
--- 53,62 ----
  /* These structs hold data associated with objects like tasks, etc. */
  
! typedef enum { EMPTY = 0,
!   PAUSED,
!   PERIODIC,
!   FREERUN,
!   ENDED
! } task_state_t;
  
  typedef struct {
***************
*** 81,87 ****
  
  typedef enum { UNUSED = 0,
! 	       HAS_READER = 1,
! 	       HAS_WRITER = 2,
! 	       HAS_BOTH = 3 } fifo_state_t;  /* used as bitmasks */
  
  typedef struct {
--- 82,89 ----
  
  typedef enum { UNUSED = 0,
!   HAS_READER = 1,
!   HAS_WRITER = 2,
!   HAS_BOTH = 3
! } fifo_state_t;			/* used as bitmasks */
  
  typedef struct {
***************
*** 123,135 ****
    int timer_running;		/* state of HW timer */
    long int timer_period;	/* HW timer period */
!   task_data task_array[RTAPI_MAX_TASKS+1];	/* data for tasks */
!   shmem_data shmem_array[RTAPI_MAX_SHMEMS+1];	/* data for shared memory */
!   sem_data sem_array[RTAPI_MAX_SEMS+1];		/* data for semaphores */
!   fifo_data fifo_array[RTAPI_MAX_FIFOS+1];	/* data for fifos */
!   irq_data irq_array[RTAPI_MAX_IRQS+1];		/* data for hooked irqs */
  } rtapi_data_t;
  
! #define RTAPI_KEY   0x90280A48    /* key used to open RTAPI shared memory */
! #define RTAPI_MAGIC 0x12601409    /* magic number used to verify shmem */
  
  /* these pointers are initialized at startup to point
--- 125,137 ----
    int timer_running;		/* state of HW timer */
    long int timer_period;	/* HW timer period */
!   task_data task_array[RTAPI_MAX_TASKS + 1];	/* data for tasks */
!   shmem_data shmem_array[RTAPI_MAX_SHMEMS + 1];	/* data for shared memory */
!   sem_data sem_array[RTAPI_MAX_SEMS + 1];	/* data for semaphores */
!   fifo_data fifo_array[RTAPI_MAX_FIFOS + 1];	/* data for fifos */
!   irq_data irq_array[RTAPI_MAX_IRQS + 1];	/* data for hooked irqs */
  } rtapi_data_t;
  
! #define RTAPI_KEY   0x90280A48	/* key used to open RTAPI shared memory */
! #define RTAPI_MAGIC 0x12601409	/* magic number used to verify shmem */
  
  /* these pointers are initialized at startup to point
***************
*** 143,152 ****
  */
  
! rtapi_data_t	*rtapi_data  = NULL;
! task_data	*task_array  = NULL;
! shmem_data	*shmem_array = NULL;
! sem_data	*sem_array   = NULL;
! fifo_data	*fifo_array  = NULL;
! irq_data	*irq_array   = NULL;
  
  /* Lightweight Mutexes - These functions are used to prevent
--- 145,154 ----
  */
  
! rtapi_data_t *rtapi_data = NULL;
! task_data *task_array = NULL;
! shmem_data *shmem_array = NULL;
! sem_data *sem_array = NULL;
! fifo_data *fifo_array = NULL;
! irq_data *irq_array = NULL;
  
  /* Lightweight Mutexes - These functions are used to prevent
***************
*** 176,180 ****
  static void mutex_get(int *mutex)
  {
!   while ( test_and_set_bit(0, mutex) ) {
      /* somebody else has the mutex, yield the CPU and try again later */
      schedule();
--- 178,182 ----
  static void mutex_get(int *mutex)
  {
!   while (test_and_set_bit(0, mutex)) {
      /* somebody else has the mutex, yield the CPU and try again later */
      schedule();
***************
*** 187,191 ****
  static void mutex_get(int *mutex)
  {
!   while ( test_and_set_bit(0, mutex) ) {
      /* somebody else has the mutex, yield the CPU and try again later */
      sched_yield();
--- 189,193 ----
  static void mutex_get(int *mutex)
  {
!   while (test_and_set_bit(0, mutex)) {
      /* somebody else has the mutex, yield the CPU and try again later */
      sched_yield();
***************
*** 195,209 ****
  #endif
  
! static void init_rtapi_data ( rtapi_data_t *data )
  {
    int n;
  
    /* has the block already been initialized? */
!   if ( data->magic == RTAPI_MAGIC ) {
      /* yes, nothing to do */
      return;
!     }
    /* no, we need to init it, grab mutex unconditionally */
!   mutex_try ( &(data->mutex) );
    /* set magic number so nobody else init's the block */
    data->magic = RTAPI_MAGIC;
--- 197,211 ----
  #endif
  
! static void init_rtapi_data(rtapi_data_t * data)
  {
    int n;
  
    /* has the block already been initialized? */
!   if (data->magic == RTAPI_MAGIC) {
      /* yes, nothing to do */
      return;
!   }
    /* no, we need to init it, grab mutex unconditionally */
!   mutex_try(&(data->mutex));
    /* set magic number so nobody else init's the block */
    data->magic = RTAPI_MAGIC;
***************
*** 243,247 ****
    }
    /* done, release the mutex */
!   mutex_give ( &(data->mutex) );
    return;
  }
--- 245,249 ----
    }
    /* done, release the mutex */
!   mutex_give(&(data->mutex));
    return;
  }

Index: rtapi_proc.h
===================================================================
RCS file: /cvsroot/emc/rtapi/src/rtapi/rtapi_proc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rtapi_proc.h	20 Aug 2003 19:46:38 -0000	1.2
--- rtapi_proc.h	22 Aug 2003 19:48:38 -0000	1.3
***************
*** 53,58 ****
      information, go to www.linuxcnc.org.
  */
! 
! #include <linux/proc_fs.h>
  
  /* Internal function for the proc_fs system. */
--- 53,57 ----
      information, go to www.linuxcnc.org.
  */
! #include "procfs_macros.h"
  
  /* Internal function for the proc_fs system. */
***************
*** 64,67 ****
--- 63,67 ----
    series kernel..
  */
+ #ifdef CONFIG_PROC_FS
  
  static struct proc_dir_entry *rtapi_dir = 0;	/* /proc/rtapi directory */

[Emc-commit] rcslib/src/cms cms_xup_no_config.h,NONE,1.1.2.1 http_srv_no_config.h,NONE,1.1.2.1 sendn_no_config.h,NONE,1.1.2.1 tcp_srv_no_config.h,NONE,1.1.2.1

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

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

Added Files:
      Tag: wps_multiplat_dev_branch
	cms_xup_no_config.h http_srv_no_config.h sendn_no_config.h 
	tcp_srv_no_config.h 
Log Message:
.

--- NEW FILE: cms_xup_no_config.h ---
#ifndef CMS_XUP_NO_CONFIG_H
#define CMS_XUP_NO_CONFIG_H

#include "rcs_defs.hh"

extern "C"
{
#ifndef NO_DCE_RPC
#include <rpc/rpc.h>		/* struct XDR */
#else
#if defined(VXWORKS) || defined(irix6)
#include <rpc/types.h>
#include <rpc/xdr.h>		// struct XDR
#else
#include "xdr.h"
#endif
#endif
#include <stdlib.h>

}

#endif

--- NEW FILE: http_srv_no_config.h ---
#ifndef HTTP_SRV_NO_CONFIG_H
#define HTTP_SRV_NO_CONFIG_H

#include "rcs_defs.hh"		/* EXTERN_C_STD_HEADERS */

#ifdef EXTERN_C_STD_HEADERS
extern "C"
{
#endif

#include <string.h>		/* memset(), strerror() */
#include <stdlib.h>		// malloc(), free()
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <dirent.h>
#include <errno.h>		/* errno */
#include <signal.h>		// SIGPIPE, signal()

#if (defined(__CENTERLINE__) && !defined(VXWORKS)) || defined(sunos5) || defined(sparcworks)
#include <sys/filio.h>		/* FIONREAD */
  char *strerror (int errnum);
  char *dl_inet_ntoa (struct in_addr);
#endif

#ifdef EXTERN_C_STD_HEADERS
}
#endif


#ifdef VXWORKS
#include "vxWorks.h"
#include "taskLib.h"		// taskSpawn
#endif

#ifdef UNIX_LIKE_PLAT
#include <sys/types.h>
#include <sys/wait.h>		// waitpid
#endif

#ifndef NO_THREADS
#ifdef SGI
#include <sys/resource.h>
#include <sys/prctl.h>		// sproc(), prctl()
#endif


#ifdef WIN32
#ifdef MULTITHREADED
#include <process.h>		// _beginthread
#else
#define NO_THREADS
#endif
#endif
#endif

#endif
// #ifndef HTTP_SRV_NO_CONFIG_H

--- NEW FILE: sendn_no_config.h ---

#ifndef SENDN_NO_CONFIG_H
#define SENDN_NO_CONFIG_H

/* This is neccessary to avoid muliple definitions of fd_set, etc when both
* RPC via PCNFS and Windows Sockets are to be available. */
#ifdef USE_PCNFS
#undef USE_PCNFS
#endif
#include "rcs_defs.hh"		/* _Windows */

#include <string.h>		/* strerror */
#include <stdlib.h>		/* memset() */

#include <errno.h>		/* errno  */
#include <math.h>		/* fabs() */

#endif

--- NEW FILE: tcp_srv_no_config.h ---

#ifndef TCP_SRV_NO_CONFIG_H
#define TCP_SRV_NO_CONFIG_H

#include "rcs_defs.hh"		/* EXTERN_C_STD_HEADERS */

#ifdef EXTERN_C_STD_HEADERS
extern "C"
{
#endif

#include <string.h>		/* memset(), strerror() */
#include <stdlib.h>		// malloc(), free()
#include <errno.h>		/* errno */
#include <signal.h>		// SIGPIPE, signal()

#if (defined(__CENTERLINE__) && !defined(VXWORKS)) || defined(sunos5) || defined(sparcworks)
#include <sys/filio.h>		/* FIONREAD */
  char *strerror (int errnum);
  char *dl_inet_ntoa (struct in_addr);
#endif

#ifdef EXTERN_C_STD_HEADERS
}
#endif


#ifdef VXWORKS
#include "vxWorks.h"
#include "taskLib.h"		// taskSpawn
#endif

#ifdef UNIX_LIKE_PLAT
#include <sys/types.h>
#include <sys/wait.h>		// waitpid
#endif

#ifndef NO_THREADS
#ifdef SGI
#include <sys/resource.h>
#include <sys/prctl.h>		// sproc(), prctl()
#endif


#ifdef WIN32
#ifdef MULTITHREADED
#include <process.h>		// _beginthread
#else
#define NO_THREADS
#endif
#endif
#endif


#endif
// ifndef TCP_SRV_NO_CONFIG_H

[Emc-commit] rcslib/src/print rcs_prnt_no_config.h,NONE,1.1.2.1

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

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

Added Files:
      Tag: wps_multiplat_dev_branch
	rcs_prnt_no_config.h 
Log Message:
.

--- NEW FILE: rcs_prnt_no_config.h ---
#ifndef RCS_PRNT_NO_CONFIG_H
#define RCS_PRNT_NO_CONFIG_H

#include "rcs_defs.hh"		/* _Windows, RCS_FAR, EXTERN_C_STD_HEADERS */

#ifdef DEBUG_MEMORY
#include "dbg_mem.h"		// DEBUG_MALLOC, DEBUG_FREE
#else
#define DEBUG_MALLOC(x) malloc(x)
#define DEBUG_FREE(x) free(x)
#endif

#ifdef EXTERN_C_STD_HEADERS
extern "C"
{
#endif

#ifdef VXWORKS
#include "vxWorks.h"
#endif


#ifdef USING_VARARGS
#include <varargs.h>		/* va_list, va_start(), va_end() */
#else
#include <stdarg.h>		/* va_list, va_start(), va_end() */
#endif

#ifndef NO_STDIO
#include <stdio.h>		/* __printf()'s */
#endif

#include <string.h>		/* strchr(), memmove() */
#include <stdlib.h>		/* malloc(), free(), realloc() */
#include <errno.h>		// errno()
#ifdef VXWORKS
#include <logLib.h>		/* logMsg() */
#endif


#ifdef VXWORKS
#include <taskLib.h>		/* taskIdSelf() */
#else
#include <sys/types.h>
#ifdef UNIX_LIKE_PLAT
#include <unistd.h>		/* getpid() */
#endif
#endif

#include <ctype.h>

#ifdef EXTERN_C_STD_HEADERS
}
#endif

#ifdef _Windows
#include <windows.h>		/* MessageBox() */
#endif

#endif
// ifndef RCS_PRNT_NO_CONFIG_H

[Emc-commit] rcslib Makefile.am,1.7.2.6,1.7.2.7 Makefile.in,1.7.2.6,1.7.2.7 configure,1.3.2.3,1.3.2.4 configure.ac,1.3.2.2,1.3.2.3 rcs_config.h.in,1.1.2.3,1.1.2.4

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

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

Modified Files:
      Tag: wps_multiplat_dev_branch
	Makefile.am Makefile.in configure configure.ac rcs_config.h.in 
Log Message:
.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/emc/rcslib/Makefile.am,v
retrieving revision 1.7.2.6
retrieving revision 1.7.2.7
diff -C2 -d -r1.7.2.6 -r1.7.2.7
*** Makefile.am	18 Aug 2003 23:19:51 -0000	1.7.2.6
--- Makefile.am	21 Aug 2003 20:24:13 -0000	1.7.2.7
***************
*** 71,75 ****
  
  
! INCLUDES= -I@srcdir@/src -I@srcdir@/src/os_intf -I@srcdir@/src/print -I@srcdir@/src/stg_clss -I@srcdir@/src/posemath -I@srcdir@/src/cms -I@srcdir@/src/node -I@RTAIDIR@/include 
  
  else !HAVE_RTAI
--- 71,75 ----
  
  
! INCLUDES= -I@srcdir@/src -I@srcdir@/src/os_intf -I@srcdir@/src/print -I@srcdir@/src/stg_clss -I@srcdir@/src/posemath -I@srcdir@/src/cms -I@srcdir@/src/node -I@RTAIDIR@/include  @EXTRA_CONFIGURED_INCLUDES@
  
  else !HAVE_RTAI
***************
*** 177,196 ****
  	src/cms/nmlqr.cc \
  	src/print/rcs_prnt.cc \
! 	src/cms/autokey.c
  
  
  
- include_HEADERS=src/rcs.hh src/rcs_defs.hh \
-   src/print/rcs_prnt.hh src/stg_clss/linklist.hh src/cms/nmlmsg.hh \
-   src/cms/nml.hh src/cms/cms_user.hh src/cms/cms.hh src/cms/cms_cfg.hh \
-   src/cms/physmem.hh src/posemath/posemath.h src/node/cmd_msg.hh \
-   src/node/stat_msg.hh src/node/wm_msg.hh src/node/nml_oi.hh \
-   src/cms/cmsdiag.hh src/cms/nmldiag.hh src/cms/cms_srv.hh \
-   src/cms/sokintrf.h src/cms/rem_msg.hh src/cms/nml_srv.hh \
-   src/os_intf/timer.hh src/os_intf/rcs_exit.hh src/os_intf/inetfile.hh \
-   src/os_intf/inifile.h src/node/nml_mod.hh src/cms/nmlqr.hh \
-   src/rcsvers.hh src/os_intf/_shm.h src/os_intf/_timer.h
  
  
  librcs_la_SOURCES= src/rcsvers.c\
  	src/os_intf/inetnull.cc\
--- 177,206 ----
  	src/cms/nmlqr.cc \
  	src/print/rcs_prnt.cc \
! 	src/cms/autokey.c \
! 	src/nt_xdr/bcopy.c \
! 	src/nt_xdr/xdr.c \
! 	src/nt_xdr/xdr_arra.c \
! 	src/nt_xdr/xdr_floa.c \
! 	src/nt_xdr/xdr_mem.c \
! 	src/nt_xdr/xdr_rec.c \
! 	src/nt_xdr/xdr_refe.c \
! 	src/nt_xdr/xdr_stdi.c
  
  
  
  
  
+ include_HEADERS=src/rcs.hh src/rcs_defs.hh \
+ 	src/print/rcs_prnt.hh src/stg_clss/linklist.hh src/cms/nmlmsg.hh \
+ 	src/cms/nml.hh src/cms/cms_user.hh src/cms/cms.hh src/cms/cms_cfg.hh \
+ 	src/cms/physmem.hh src/posemath/posemath.h src/node/cmd_msg.hh \
+ 	src/node/stat_msg.hh src/node/wm_msg.hh src/node/nml_oi.hh \
+ 	src/cms/cmsdiag.hh src/cms/nmldiag.hh src/cms/cms_srv.hh \
+ 	src/cms/sokintrf.h src/cms/rem_msg.hh src/cms/nml_srv.hh \
+ 	src/os_intf/timer.hh src/os_intf/rcs_exit.hh src/os_intf/inetfile.hh \
+ 	src/os_intf/inifile.h src/node/nml_mod.hh src/cms/nmlqr.hh \
+ 	src/rcsvers.hh src/os_intf/_shm.h src/os_intf/_timer.h \
+ 	src/cms/ttyintf.h
+ 
  librcs_la_SOURCES= src/rcsvers.c\
  	src/os_intf/inetnull.cc\
***************
*** 368,372 ****
  	src/cms/ttytest.c\
  	src/cms/windlg.c\
- 	src/nt_xdr/bcopy.c\
  	src/nt_xdr/xdr.c\
  	src/nt_xdr/xdr_arra.c\
--- 378,381 ----
***************
*** 640,644 ****
  	src/cms/sokintrf.h\
  	src/cms/spinlock.h\
- 	src/cms/ttyintf.h\
  	src/cms/windlg.h\
  	src/cms/writen.h\
--- 649,652 ----
***************
*** 734,737 ****
--- 742,746 ----
  	src/test/nml_test_format.hh \
  	src/cms/cms_cfg_no_config.h \
+ 	src/cms/cms_xup_no_config.h \
  	src/cms/cmsdiag_no_config.h \
  	src/cms/sokintrf_no_config.h \

Index: Makefile.in
===================================================================
RCS file: /cvsroot/emc/rcslib/Makefile.in,v
retrieving revision 1.7.2.6
retrieving revision 1.7.2.7
diff -C2 -d -r1.7.2.6 -r1.7.2.7
*** Makefile.in	18 Aug 2003 23:19:51 -0000	1.7.2.6
--- Makefile.in	21 Aug 2003 20:24:13 -0000	1.7.2.7
***************
*** 70,73 ****
--- 70,74 ----
  AWK = @AWK@
  CC = @CC@
+ CONFIGURED_EXTRA_INCLUDES = @CONFIGURED_EXTRA_INCLUDES@
  CONFIGURED_PROGRAMS = @CONFIGURED_PROGRAMS@
  CONFIGURED_STATIC_LIBRARIES = @CONFIGURED_STATIC_LIBRARIES@
***************
*** 170,174 ****
  @HAVE_RTAI_TRUE@librcsrtai_a_CFLAGS = @RTAICFLAGS@ -Drtai -DNO_STDIO_SUPPORT -O2 -ffast-math
  
! @HAVE_RTAI_TRUE@INCLUDES = -I@srcdir@/src -I@srcdir@/src/os_intf -I@srcdir@/src/print -I@srcdir@/src/stg_clss -I@srcdir@/src/posemath -I@srcdir@/src/cms -I@srcdir@/src/node -I@RTAIDIR@/include 
  @HAVE_RTAI_FALSE@@HAVE_RTL_TRUE@INCLUDES = -I@srcdir@/src -I@srcdir@/src/os_intf -I@srcdir@/src/print -I@srcdir@/src/stg_clss -I@srcdir@/src/posemath -I@srcdir@/src/cms -I@srcdir@/src/node -I@RTLINUXDIR@/include 
  @HAVE_RTAI_FALSE@@HAVE_RTL_FALSE@INCLUDES = -I@srcdir@/src -I@srcdir@/src/os_intf -I@srcdir@/src/print -I@srcdir@/src/stg_clss -I@srcdir@/src/posemath -I@srcdir@/src/cms -I@srcdir@/src/node 
--- 171,175 ----
  @HAVE_RTAI_TRUE@librcsrtai_a_CFLAGS = @RTAICFLAGS@ -Drtai -DNO_STDIO_SUPPORT -O2 -ffast-math
  
! @HAVE_RTAI_TRUE@INCLUDES = -I@srcdir@/src -I@srcdir@/src/os_intf -I@srcdir@/src/print -I@srcdir@/src/stg_clss -I@srcdir@/src/posemath -I@srcdir@/src/cms -I@srcdir@/src/node -I@RTAIDIR@/include  @EXTRA_CONFIGURED_INCLUDES@
  @HAVE_RTAI_FALSE@@HAVE_RTL_TRUE@INCLUDES = -I@srcdir@/src -I@srcdir@/src/os_intf -I@srcdir@/src/print -I@srcdir@/src/stg_clss -I@srcdir@/src/posemath -I@srcdir@/src/cms -I@srcdir@/src/node -I@RTLINUXDIR@/include 
  @HAVE_RTAI_FALSE@@HAVE_RTL_FALSE@INCLUDES = -I@srcdir@/src -I@srcdir@/src/os_intf -I@srcdir@/src/print -I@srcdir@/src/stg_clss -I@srcdir@/src/posemath -I@srcdir@/src/cms -I@srcdir@/src/node 
***************
*** 269,285 ****
  	src/cms/nmlqr.cc \
  	src/print/rcs_prnt.cc \
! 	src/cms/autokey.c
  
  
  include_HEADERS = src/rcs.hh src/rcs_defs.hh \
!   src/print/rcs_prnt.hh src/stg_clss/linklist.hh src/cms/nmlmsg.hh \
!   src/cms/nml.hh src/cms/cms_user.hh src/cms/cms.hh src/cms/cms_cfg.hh \
!   src/cms/physmem.hh src/posemath/posemath.h src/node/cmd_msg.hh \
!   src/node/stat_msg.hh src/node/wm_msg.hh src/node/nml_oi.hh \
!   src/cms/cmsdiag.hh src/cms/nmldiag.hh src/cms/cms_srv.hh \
!   src/cms/sokintrf.h src/cms/rem_msg.hh src/cms/nml_srv.hh \
!   src/os_intf/timer.hh src/os_intf/rcs_exit.hh src/os_intf/inetfile.hh \
!   src/os_intf/inifile.h src/node/nml_mod.hh src/cms/nmlqr.hh \
!   src/rcsvers.hh src/os_intf/_shm.h src/os_intf/_timer.h
  
  
--- 270,295 ----
  	src/cms/nmlqr.cc \
  	src/print/rcs_prnt.cc \
! 	src/cms/autokey.c \
! 	src/nt_xdr/bcopy.c \
! 	src/nt_xdr/xdr.c \
! 	src/nt_xdr/xdr_arra.c \
! 	src/nt_xdr/xdr_floa.c \
! 	src/nt_xdr/xdr_mem.c \
! 	src/nt_xdr/xdr_rec.c \
! 	src/nt_xdr/xdr_refe.c \
! 	src/nt_xdr/xdr_stdi.c
  
  
  include_HEADERS = src/rcs.hh src/rcs_defs.hh \
! 	src/print/rcs_prnt.hh src/stg_clss/linklist.hh src/cms/nmlmsg.hh \
! 	src/cms/nml.hh src/cms/cms_user.hh src/cms/cms.hh src/cms/cms_cfg.hh \
! 	src/cms/physmem.hh src/posemath/posemath.h src/node/cmd_msg.hh \
! 	src/node/stat_msg.hh src/node/wm_msg.hh src/node/nml_oi.hh \
! 	src/cms/cmsdiag.hh src/cms/nmldiag.hh src/cms/cms_srv.hh \
! 	src/cms/sokintrf.h src/cms/rem_msg.hh src/cms/nml_srv.hh \
! 	src/os_intf/timer.hh src/os_intf/rcs_exit.hh src/os_intf/inetfile.hh \
! 	src/os_intf/inifile.h src/node/nml_mod.hh src/cms/nmlqr.hh \
! 	src/rcsvers.hh src/os_intf/_shm.h src/os_intf/_timer.h \
! 	src/cms/ttyintf.h
  
  
***************
*** 460,464 ****
  	src/cms/ttytest.c\
  	src/cms/windlg.c\
- 	src/nt_xdr/bcopy.c\
  	src/nt_xdr/xdr.c\
  	src/nt_xdr/xdr_arra.c\
--- 470,473 ----
***************
*** 733,737 ****
  	src/cms/sokintrf.h\
  	src/cms/spinlock.h\
- 	src/cms/ttyintf.h\
  	src/cms/windlg.h\
  	src/cms/writen.h\
--- 742,745 ----
***************
*** 827,830 ****
--- 835,839 ----
  	src/test/nml_test_format.hh \
  	src/cms/cms_cfg_no_config.h \
+ 	src/cms/cms_xup_no_config.h \
  	src/cms/cmsdiag_no_config.h \
  	src/cms/sokintrf_no_config.h \
***************
*** 1052,1057 ****
  @AMDEP_TRUE@	./$(DEPDIR)/_mathprnt.Plo ./$(DEPDIR)/_posemath.Plo \
  @AMDEP_TRUE@	./$(DEPDIR)/_shm.Plo ./$(DEPDIR)/_timer.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/autokey.Plo ./$(DEPDIR)/cmd_msg.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/cms.Plo ./$(DEPDIR)/cms_cfg.Plo \
  @AMDEP_TRUE@	./$(DEPDIR)/cms_datetime.Plo \
  @AMDEP_TRUE@	./$(DEPDIR)/cms_dup.Plo ./$(DEPDIR)/cms_in.Plo \
--- 1061,1067 ----
  @AMDEP_TRUE@	./$(DEPDIR)/_mathprnt.Plo ./$(DEPDIR)/_posemath.Plo \
  @AMDEP_TRUE@	./$(DEPDIR)/_shm.Plo ./$(DEPDIR)/_timer.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/autokey.Plo ./$(DEPDIR)/bcopy.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/cmd_msg.Plo ./$(DEPDIR)/cms.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/cms_cfg.Plo \
  @AMDEP_TRUE@	./$(DEPDIR)/cms_datetime.Plo \
  @AMDEP_TRUE@	./$(DEPDIR)/cms_dup.Plo ./$(DEPDIR)/cms_in.Plo \
***************
*** 1102,1106 ****
  @AMDEP_TRUE@	./$(DEPDIR)/udp_opts.Plo ./$(DEPDIR)/udp_srv.Plo \
  @AMDEP_TRUE@	./$(DEPDIR)/udpmem.Plo ./$(DEPDIR)/unix_sem.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/xdr_msg.Plo \
  @AMDEP_TRUE@	./$(DEPDIR)/xsd2nmlh-_timer.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/xsd2nmlh-cms_xml_up.Po \
--- 1112,1119 ----
  @AMDEP_TRUE@	./$(DEPDIR)/udp_opts.Plo ./$(DEPDIR)/udp_srv.Plo \
  @AMDEP_TRUE@	./$(DEPDIR)/udpmem.Plo ./$(DEPDIR)/unix_sem.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/xdr.Plo ./$(DEPDIR)/xdr_arra.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/xdr_floa.Plo ./$(DEPDIR)/xdr_mem.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/xdr_msg.Plo ./$(DEPDIR)/xdr_rec.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/xdr_refe.Plo ./$(DEPDIR)/xdr_stdi.Plo \
  @AMDEP_TRUE@	./$(DEPDIR)/xsd2nmlh-_timer.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/xsd2nmlh-cms_xml_up.Po \
***************
*** 1437,1440 ****
--- 1450,1461 ----
  rcs_prnt.lo: src/print/rcs_prnt.cc
  autokey.lo: src/cms/autokey.c
+ bcopy.lo: src/nt_xdr/bcopy.c
+ xdr.lo: src/nt_xdr/xdr.c
+ xdr_arra.lo: src/nt_xdr/xdr_arra.c
+ xdr_floa.lo: src/nt_xdr/xdr_floa.c
+ xdr_mem.lo: src/nt_xdr/xdr_mem.c
+ xdr_rec.lo: src/nt_xdr/xdr_rec.c
+ xdr_refe.lo: src/nt_xdr/xdr_refe.c
+ xdr_stdi.lo: src/nt_xdr/xdr_stdi.c
  librcs.la: $(librcs_la_OBJECTS) $(librcs_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(librcs_la_LDFLAGS) $(librcs_la_OBJECTS) $(librcs_la_LIBADD) $(LIBS)
***************
*** 2002,2005 ****
--- 2023,2027 ----
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_timer.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/autokey.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bcopy.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmd_msg.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cms.Plo@am__quote@
***************
*** 2085,2089 ****
--- 2107,2118 ----
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/udpmem.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unix_sem.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdr.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdr_arra.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdr_floa.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdr_mem.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdr_msg.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdr_rec.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdr_refe.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdr_stdi.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsd2nmlh-_timer.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsd2nmlh-cms_xml_up.Po@am__quote@
***************
*** 2669,2672 ****
--- 2698,2845 ----
  @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o autokey.lo `test -f 'src/cms/autokey.c' || echo '$(srcdir)/'`src/cms/autokey.c
+ 
+ bcopy.o: src/nt_xdr/bcopy.c
+ @AMDEP_TRUE@	source='src/nt_xdr/bcopy.c' object='bcopy.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/bcopy.Po' tmpdepfile='$(DEPDIR)/bcopy.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bcopy.o `test -f 'src/nt_xdr/bcopy.c' || echo '$(srcdir)/'`src/nt_xdr/bcopy.c
+ 
+ bcopy.obj: src/nt_xdr/bcopy.c
+ @AMDEP_TRUE@	source='src/nt_xdr/bcopy.c' object='bcopy.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/bcopy.Po' tmpdepfile='$(DEPDIR)/bcopy.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bcopy.obj `cygpath -w src/nt_xdr/bcopy.c`
+ 
+ bcopy.lo: src/nt_xdr/bcopy.c
+ @AMDEP_TRUE@	source='src/nt_xdr/bcopy.c' object='bcopy.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/bcopy.Plo' tmpdepfile='$(DEPDIR)/bcopy.TPlo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bcopy.lo `test -f 'src/nt_xdr/bcopy.c' || echo '$(srcdir)/'`src/nt_xdr/bcopy.c
+ 
+ xdr.o: src/nt_xdr/xdr.c
+ @AMDEP_TRUE@	source='src/nt_xdr/xdr.c' object='xdr.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/xdr.Po' tmpdepfile='$(DEPDIR)/xdr.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdr.o `test -f 'src/nt_xdr/xdr.c' || echo '$(srcdir)/'`src/nt_xdr/xdr.c
+ 
+ xdr.obj: src/nt_xdr/xdr.c
+ @AMDEP_TRUE@	source='src/nt_xdr/xdr.c' object='xdr.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/xdr.Po' tmpdepfile='$(DEPDIR)/xdr.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdr.obj `cygpath -w src/nt_xdr/xdr.c`
+ 
+ xdr.lo: src/nt_xdr/xdr.c
+ @AMDEP_TRUE@	source='src/nt_xdr/xdr.c' object='xdr.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/xdr.Plo' tmpdepfile='$(DEPDIR)/xdr.TPlo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdr.lo `test -f 'src/nt_xdr/xdr.c' || echo '$(srcdir)/'`src/nt_xdr/xdr.c
+ 
+ xdr_arra.o: src/nt_xdr/xdr_arra.c
+ @AMDEP_TRUE@	source='src/nt_xdr/xdr_arra.c' object='xdr_arra.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/xdr_arra.Po' tmpdepfile='$(DEPDIR)/xdr_arra.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdr_arra.o `test -f 'src/nt_xdr/xdr_arra.c' || echo '$(srcdir)/'`src/nt_xdr/xdr_arra.c
+ 
+ xdr_arra.obj: src/nt_xdr/xdr_arra.c
+ @AMDEP_TRUE@	source='src/nt_xdr/xdr_arra.c' object='xdr_arra.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/xdr_arra.Po' tmpdepfile='$(DEPDIR)/xdr_arra.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdr_arra.obj `cygpath -w src/nt_xdr/xdr_arra.c`
+ 
+ xdr_arra.lo: src/nt_xdr/xdr_arra.c
+ @AMDEP_TRUE@	source='src/nt_xdr/xdr_arra.c' object='xdr_arra.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/xdr_arra.Plo' tmpdepfile='$(DEPDIR)/xdr_arra.TPlo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdr_arra.lo `test -f 'src/nt_xdr/xdr_arra.c' || echo '$(srcdir)/'`src/nt_xdr/xdr_arra.c
+ 
+ xdr_floa.o: src/nt_xdr/xdr_floa.c
+ @AMDEP_TRUE@	source='src/nt_xdr/xdr_floa.c' object='xdr_floa.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/xdr_floa.Po' tmpdepfile='$(DEPDIR)/xdr_floa.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdr_floa.o `test -f 'src/nt_xdr/xdr_floa.c' || echo '$(srcdir)/'`src/nt_xdr/xdr_floa.c
+ 
+ xdr_floa.obj: src/nt_xdr/xdr_floa.c
+ @AMDEP_TRUE@	source='src/nt_xdr/xdr_floa.c' object='xdr_floa.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/xdr_floa.Po' tmpdepfile='$(DEPDIR)/xdr_floa.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdr_floa.obj `cygpath -w src/nt_xdr/xdr_floa.c`
+ 
+ xdr_floa.lo: src/nt_xdr/xdr_floa.c
+ @AMDEP_TRUE@	source='src/nt_xdr/xdr_floa.c' object='xdr_floa.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/xdr_floa.Plo' tmpdepfile='$(DEPDIR)/xdr_floa.TPlo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdr_floa.lo `test -f 'src/nt_xdr/xdr_floa.c' || echo '$(srcdir)/'`src/nt_xdr/xdr_floa.c
+ 
+ xdr_mem.o: src/nt_xdr/xdr_mem.c
+ @AMDEP_TRUE@	source='src/nt_xdr/xdr_mem.c' object='xdr_mem.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/xdr_mem.Po' tmpdepfile='$(DEPDIR)/xdr_mem.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdr_mem.o `test -f 'src/nt_xdr/xdr_mem.c' || echo '$(srcdir)/'`src/nt_xdr/xdr_mem.c
+ 
+ xdr_mem.obj: src/nt_xdr/xdr_mem.c
+ @AMDEP_TRUE@	source='src/nt_xdr/xdr_mem.c' object='xdr_mem.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/xdr_mem.Po' tmpdepfile='$(DEPDIR)/xdr_mem.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdr_mem.obj `cygpath -w src/nt_xdr/xdr_mem.c`
+ 
+ xdr_mem.lo: src/nt_xdr/xdr_mem.c
+ @AMDEP_TRUE@	source='src/nt_xdr/xdr_mem.c' object='xdr_mem.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/xdr_mem.Plo' tmpdepfile='$(DEPDIR)/xdr_mem.TPlo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdr_mem.lo `test -f 'src/nt_xdr/xdr_mem.c' || echo '$(srcdir)/'`src/nt_xdr/xdr_mem.c
+ 
+ xdr_rec.o: src/nt_xdr/xdr_rec.c
+ @AMDEP_TRUE@	source='src/nt_xdr/xdr_rec.c' object='xdr_rec.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/xdr_rec.Po' tmpdepfile='$(DEPDIR)/xdr_rec.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdr_rec.o `test -f 'src/nt_xdr/xdr_rec.c' || echo '$(srcdir)/'`src/nt_xdr/xdr_rec.c
+ 
+ xdr_rec.obj: src/nt_xdr/xdr_rec.c
+ @AMDEP_TRUE@	source='src/nt_xdr/xdr_rec.c' object='xdr_rec.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/xdr_rec.Po' tmpdepfile='$(DEPDIR)/xdr_rec.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdr_rec.obj `cygpath -w src/nt_xdr/xdr_rec.c`
+ 
+ xdr_rec.lo: src/nt_xdr/xdr_rec.c
+ @AMDEP_TRUE@	source='src/nt_xdr/xdr_rec.c' object='xdr_rec.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/xdr_rec.Plo' tmpdepfile='$(DEPDIR)/xdr_rec.TPlo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdr_rec.lo `test -f 'src/nt_xdr/xdr_rec.c' || echo '$(srcdir)/'`src/nt_xdr/xdr_rec.c
+ 
+ xdr_refe.o: src/nt_xdr/xdr_refe.c
+ @AMDEP_TRUE@	source='src/nt_xdr/xdr_refe.c' object='xdr_refe.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/xdr_refe.Po' tmpdepfile='$(DEPDIR)/xdr_refe.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdr_refe.o `test -f 'src/nt_xdr/xdr_refe.c' || echo '$(srcdir)/'`src/nt_xdr/xdr_refe.c
+ 
+ xdr_refe.obj: src/nt_xdr/xdr_refe.c
+ @AMDEP_TRUE@	source='src/nt_xdr/xdr_refe.c' object='xdr_refe.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/xdr_refe.Po' tmpdepfile='$(DEPDIR)/xdr_refe.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdr_refe.obj `cygpath -w src/nt_xdr/xdr_refe.c`
+ 
+ xdr_refe.lo: src/nt_xdr/xdr_refe.c
+ @AMDEP_TRUE@	source='src/nt_xdr/xdr_refe.c' object='xdr_refe.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/xdr_refe.Plo' tmpdepfile='$(DEPDIR)/xdr_refe.TPlo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdr_refe.lo `test -f 'src/nt_xdr/xdr_refe.c' || echo '$(srcdir)/'`src/nt_xdr/xdr_refe.c
+ 
+ xdr_stdi.o: src/nt_xdr/xdr_stdi.c
+ @AMDEP_TRUE@	source='src/nt_xdr/xdr_stdi.c' object='xdr_stdi.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/xdr_stdi.Po' tmpdepfile='$(DEPDIR)/xdr_stdi.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdr_stdi.o `test -f 'src/nt_xdr/xdr_stdi.c' || echo '$(srcdir)/'`src/nt_xdr/xdr_stdi.c
+ 
+ xdr_stdi.obj: src/nt_xdr/xdr_stdi.c
+ @AMDEP_TRUE@	source='src/nt_xdr/xdr_stdi.c' object='xdr_stdi.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/xdr_stdi.Po' tmpdepfile='$(DEPDIR)/xdr_stdi.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdr_stdi.obj `cygpath -w src/nt_xdr/xdr_stdi.c`
+ 
+ xdr_stdi.lo: src/nt_xdr/xdr_stdi.c
+ @AMDEP_TRUE@	source='src/nt_xdr/xdr_stdi.c' object='xdr_stdi.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/xdr_stdi.Plo' tmpdepfile='$(DEPDIR)/xdr_stdi.TPlo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdr_stdi.lo `test -f 'src/nt_xdr/xdr_stdi.c' || echo '$(srcdir)/'`src/nt_xdr/xdr_stdi.c
  
  posix_sem_unlink.o: src/os_intf/posix_sem_unlink.c

Index: configure
===================================================================
RCS file: /cvsroot/emc/rcslib/configure,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -d -r1.3.2.3 -r1.3.2.4
*** configure	18 Aug 2003 23:19:51 -0000	1.3.2.3
--- configure	21 Aug 2003 20:24:13 -0000	1.3.2.4
***************
*** 1050,1057 ****
                            backwards compatibility and simpler linking.
                            (default=no)
!   --enable-posemath_in_nmlmod
!                           Include the objects for posemath in the nmlmod for
!                           backwards compatibility and simpler linking.
!                           (default=yes)
    --enable-xsd2nmlh       Build the xsd2nmlh program. (default=yes)
    --enable-ALL            Enable/Disable all of the above in one command.
--- 1050,1057 ----
                            backwards compatibility and simpler linking.
[...3033 lines suppressed...]
+ { echo "$as_me:$LINENO:  LIBS = ${LIBS} " >&5
+ echo "$as_me:  LIBS = ${LIBS} " >&6;}
  { echo "$as_me:$LINENO:  CC = ${CC} " >&5
  echo "$as_me:  CC = ${CC} " >&6;}
***************
*** 15315,15318 ****
--- 17304,17308 ----
  
  
+ 
  ac_config_files="$ac_config_files Makefile"
  
***************
*** 16011,16014 ****
--- 18001,18005 ----
  s,@CONFIGURED_SUBDIRS@,$CONFIGURED_SUBDIRS,;t t
  s,@CONFIGURED_STATIC_LIBRARIES@,$CONFIGURED_STATIC_LIBRARIES,;t t
+ s,@CONFIGURED_EXTRA_INCLUDES@,$CONFIGURED_EXTRA_INCLUDES,;t t
  s,@LTLIBOBJS@,$LTLIBOBJS,;t t
  CEOF

Index: configure.ac
===================================================================
RCS file: /cvsroot/emc/rcslib/configure.ac,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -d -r1.3.2.2 -r1.3.2.3
*** configure.ac	18 Aug 2003 23:19:51 -0000	1.3.2.2
--- configure.ac	21 Aug 2003 20:24:13 -0000	1.3.2.3
***************
*** 11,14 ****
--- 11,15 ----
  CONFIGURED_STATIC_LIBRARIES=""
  CONFIGURED_SUBDIRS=
+ CONFIGURED_EXTRA_INCLUDES=
  LTLIBOBJS=
  
***************
*** 19,24 ****
  fi
  
- 
- 
  AC_ARG_WITH(posix_ipc,
  	[AC_HELP_STRING([--with-posix-ipc],
--- 20,23 ----
***************
*** 55,59 ****
  	[with_libpthread=$withval;
  	AC_MSG_NOTICE([with_libpthread=${with_libpthread}])],
! 	[with_libpthread=yes]
  	)
  
--- 54,67 ----
  	[with_libpthread=$withval;
  	AC_MSG_NOTICE([with_libpthread=${with_libpthread}])],
! 	[with_libpthread=no]
! 	)
! 
! 
! AC_ARG_WITH(posix_threads,
! 	[AC_HELP_STRING([--with-posix_threads],
! 	[Check for POSIX threads and use if found. (You may need to seperately enable libpthread.) (default=yes)])],
! 	[with_posix_threads=$withval;
! 	AC_MSG_NOTICE([with_posix_threads=${with_posix_threads}])],
! 	[with_posix_threads=yes]
  	)
  
***************
*** 258,271 ****
  	[enable_posemath_in_rcslib=$enableval;
  	AC_MSG_NOTICE([enable_posemath_in_rcslib=$enableval])],
! 	[enable_posemath_in_rcslib=no])
  
  
  
! AC_ARG_ENABLE(posemath_in_nmlmod,
! 	[AC_HELP_STRING([--enable-posemath_in_nmlmod],
! 	[Include the objects for posemath in the nmlmod for backwards compatibility and simpler linking. (default=yes)])],
! 	[enable_posemath_in_nmlmod=$enableval;
! 	AC_MSG_NOTICE([enable_posemath_in_nmlmod=$enableval])],
! 	[enable_posemath_in_nmlmod=yes])
  
  
--- 266,279 ----
  	[enable_posemath_in_rcslib=$enableval;
  	AC_MSG_NOTICE([enable_posemath_in_rcslib=$enableval])],
! 	[enable_posemath_in_rcslib=yes])
  
  
  
! AC_ARG_ENABLE(nmlmod_in_rcslib,
! 	[AC_HELP_STRING([--enable-nmlmod_in_rcslib],
! 	[Include the objects for NML_MODULE, RCS_CMD_MSG, and RCS_STAT_MSG  in the rcslib for backwards compatibility and simpler linking. (default=yes)])],
! 	[enable_nmlmod_in_rcslib=$enableval;
! 	AC_MSG_NOTICE([enable_nmlmod_in_rcslib=$enableval])],
! 	[enable_nmlmod_in_rcslib=yes])
  
  
***************
*** 284,290 ****
  	[enable_nml_codegen=${enableval};enable_rcs_jar=${enableval};enable_codegen_jar=${enableval};enable_diagapplet_jar=${enableval};enable_filemem=${enableval};enable_xml=${enableval};enable_xdr=${enableval};enable_disp=${enableval};enable_diag=${enableval};enable_print=${enableval};enable_nmlqr=${enableval};enable_xsd2nmlh=${enableval};enable_locmem=${enableval};enable_phantom=${enableval};enable_shmem=${enableval};enable_stcp=${enableval};enable_tcp=${enableval};enable_udp=${enableval};enable_tty=${enableval};enable_crypt=${enableval};enable_http=${enableval};enable_posemath_in_rcslib=${enableval};enable_nmlmod_in_rcslib=${enableval};enable_server=${enableval};enable_sokintrf=${enable_val};enable_rtlmem=${enableval}])
  
- 
- 
- 
  if test "x${enable_xsd2nmlh}" = "xyes" ; then
     CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} xsd2nmlh"
--- 292,295 ----
***************
*** 292,297 ****
  fi
  
- 
- 
  if test "x${enable_filemem}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} filemem.lo"
--- 297,300 ----
***************
*** 302,306 ****
  fi
  
- 
  if test "x${enable_shmem}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} shmem.lo _shm.lo shm.lo sem.lo memsem.lo autokey.lo"
--- 305,308 ----
***************
*** 503,510 ****
  AC_CHECK_HEADER([windows.h],check_for_windows_stuff=yes)
  
  if test "x${enable_nml_codegen}" = "xyes" ; then 
     AM_PROG_GCJ
  
- 
     if test ! -z "$GCJ" ; then
  
--- 505,562 ----
  AC_CHECK_HEADER([windows.h],check_for_windows_stuff=yes)
  
+ if test "x${check_for_windows_stuff}" = "xyes" ; then
+    AC_DEFINE(HAVE_WINDOWS_H,1,[Define to 1 if you have windows.h])   
+ fi
+ 
+ if test "x${enable_xdr}" = "xyes" ; then
+ 
+    AC_CHECK_HEADER([rpc/rpc.h],
+ 		       [ac_cv_have_rpc_rpc_h=yes],
+ 		       [ac_cv_have_rpc_rpc_h=no])
+ 
+    if test "x${ac_cv_have_rpc_rpc_h}" = "xyes" ; then
+       AC_DEFINE(HAVE_RPC_RPC_H,1,[Define to 1 if you have the <rpc/rpc.h> header file.])
+    fi
+ 
+ 
+    AC_CHECK_HEADER([rpc/xdr.h],
+ 		[ac_cv_have_rpc_xdr_h=yes],
+ 		[ac_cv_have_rpc_xdr_h=no])
+ 
+     if test "x${ac_cv_have_rpc_xdr_h}" = "xyes" ; then
+        AC_DEFINE(HAVE_RPC_XDR_H,1,[Define to 1 if you have the <rpc/xdr.h> header file.])
+     fi
+ 
+     AC_CHECK_HEADER([rpc/types.h],
+ 			[ac_cv_have_rpc_types_h=yes],
+ 			[ac_cv_have_rpc_types_h=no])
+ 
+     if test "x${ac_cv_have_rpc_types_h}" = "xyes" ; then
+        AC_DEFINE(HAVE_RPC_TYPES_H,1,[Define to 1 if you have the <rpc/types.h> header file.])
+     fi
+ 
+     AC_CHECK_HEADER([xdr.h],
+ 			[ac_cv_have_xdr_h=yes],
+ 			[ac_cv_have_xdr_h=no])
+ 
+     if test "x${ac_cv_have_xdr_h}" = "xno" -a "x${ac_cv_have_rpc_rpc_h}" = "xno" -a  "x${ac_cv_have_rpc_xdr_h}" = "xno" -a "x${check_for_windows_stuff}" = "xyes" ; then
+ 
+        ac_cv_have_xdr_h=yes
+        CPPFLAGS="${CPPFLAGS} -I${srcdir}/src/nt_xdr";
+        AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
+        LTLIBOBJS="${LTLIBOBJS} bcopy.lo xdr.lo xdr_arra.lo xdr_floa.lo xdr_mem.lo xdr_rec.lo xdr_refe.lo xdr_stdi.lo";
+        AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
+     fi
+ 
+     if test "x${ac_cv_have_xdr_h}" = "xyes" ; then
+        AC_DEFINE(HAVE_XDR_H,1,[Define to 1 if you have the <xdr.h> header file.])
+     fi
+   
+ fi
+ # // if test  test "x${enable_xdr}" = "xyes"
+ 
  if test "x${enable_nml_codegen}" = "xyes" ; then 
     AM_PROG_GCJ
  
     if test ! -z "$GCJ" ; then
  
***************
*** 514,519 ****
        CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} nml_codegen";
        AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
-       fi
  
  fi
  
--- 566,571 ----
        CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} nml_codegen";
        AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
  
+    fi
  fi
  
***************
*** 566,570 ****
  AC_HEADER_SYS_WAIT
  AC_CHECK_HEADERS([errno.h ctype.h arpa/inet.h fcntl.h netdb.h netinet/in.h  sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/utsname.h sys/systeminfo.h sys/time.h syslog.h termios.h unistd.h semaphore.h sys/filio.h math.h signal.h dirent.h])
! AC_CHECK_HEADERS([sys/ipc.h sys/sem.h sys/fcntl.h sys/stat.h sys/wait.h sys/mman.h sys/shm.h pthread.h sys/sysinfo.h])
  
  AC_CHECK_HEADERS(standards.h sys/xti.h)
--- 618,622 ----
  AC_HEADER_SYS_WAIT
  AC_CHECK_HEADERS([errno.h ctype.h arpa/inet.h fcntl.h netdb.h netinet/in.h  sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/utsname.h sys/systeminfo.h sys/time.h syslog.h termios.h unistd.h semaphore.h sys/filio.h math.h signal.h dirent.h])
! AC_CHECK_HEADERS([sys/ipc.h sys/sem.h sys/fcntl.h sys/stat.h sys/wait.h sys/mman.h sys/shm.h sys/sysinfo.h])
  
  AC_CHECK_HEADERS(standards.h sys/xti.h)
***************
*** 590,666 ****
  if test "x${check_for_windows_stuff}" = "xyes" ; then
  
! {
!    ORIG_LDFLAGS=${LDFLAGS}
!    AC_CACHE_CHECK([for winsock2.h],
!    ac_cv_have_winsock2,
  	AC_CHECK_HEADER([winsock2.h],
! 		[	
! 		LDFLAGS="${LDFLAGS} -lws2_32"
! 		AC_TRY_LINK(
! 		[
! 		#include <winsock2.h>
! 		#include <windows.h>
! 		],
! 		[
! 			short winsock_version;
! 			WSADATA startup_data;
! 
! 			winsock_version = MAKEWORD (2, 0);
! 			WSAStartup(winsock_version, &startup_data);
! 			WSAGetLastError()
! 			socket (AF_INET, SOCK_STREAM, 0);
! 		],
! 		[
! 		AC_DEFINE(HAVE_WINSOCK2,1,[Define to 1 you have a working winsock2.h system.])
! 		ac_cv_have_winsock2=yes
! 		],
! 		[
! 		ac_cv_have_winsock2=no
! 		LDFLAGS=${ORIG_LDFLAGS}
! 		]
  		)
- 		],
- 		[ac_cv_have_winsock2=no]
- 	)
-    )
  
!    if test "x${ac_cv_have_winsock}" = "xno" ; then
!       AC_CACHE_CHECK([for winsock.h],
! 	ac_cv_have_winsock,
! 	AC_CHECK_HEADER([winsock.h],
! 		[	
! 		LDFLAGS="${LDFLAGS} -lwsock32"
! 		AC_TRY_LINK(
! 		[
! 		#include <winsock.h>
! 		#include <windows.h>
! 		],
! 		[
! 			short winsock_version;
! 			WSADATA startup_data;
  
! 			winsock_version = MAKEWORD (2, 0);
! 			WSAStartup(winsock_version, &startup_data);
! 			WSAGetLastError()
! 			socket (AF_INET, SOCK_STREAM, 0);
! 		],
! 		[
! 		AC_DEFINE(HAVE_WINSOCK,1, [Define to 1 you have a working winsock.h system.])
! 		ac_cv_have_winsock=yes
! 		],
  		[
! 		ac_cv_have_winsock=no
! 		LDFLAGS=${ORIG_LDFLAGS}
! 		]
! 		)
! 		],
! 		[ac_cv_have_winsock=no]
! 	)
!    )
     fi
  
-    AC_CHECK_HEADERS([winver.h toolhelp.h dos.h])
     AC_CACHE_CHECK([for GetTickCount],
     ac_cv_have_gettickcount,
  	AC_TRY_LINK([
  	      #include <windows.h>
--- 642,742 ----
  if test "x${check_for_windows_stuff}" = "xyes" ; then
  
!    if test "x${enable_sokintrf}" = "xyes" ; then
!    
! 	ORIG_LIBS=${LIBS}
  	AC_CHECK_HEADER([winsock2.h],
! 			    [	
! 			    LIBS="${LIBS} -lws2_32"
! 			    AC_CACHE_CHECK([can link ws2_32],
! 						ac_cv_can_link_ws2_32,
! 						[
! 						AC_TRY_LINK(
! 			    [
! 			    #include <windows.h>
! 			    #include <winsock2.h>
! 			    ],
! 			    [
! 				short winsock_version;
! 				WSADATA startup_data;
! 				winsock_version = MAKEWORD (2, 0);
! 				WSAStartup(winsock_version, &startup_data);
! 				WSAGetLastError();
! 				socket (AF_INET, SOCK_STREAM, 0);
! 				],
! 				[
! 				ac_cv_can_link_ws2_32=yes;
! 				],
! 				[
! 				ac_cv_can_link_ws2_32=no;
! 				]
! 				)
! 				ac_cv_have_winsock2=${ac_cv_can_link_ws2_32};
! 				])	
! 			],
! 			[ac_cv_have_winsock2=no]
  		)
  
! 	AC_MSG_NOTICE([ac_cv_have_winsock2=${ac_cv_have_winsock2}])
  
! 	if test "x${ac_cv_have_winsock2}" = "xyes" ; then
! 	   AC_DEFINE(HAVE_WINSOCK2_H,1,[Define to 1 you have a working winsock2.h  and ws2_32.lib system.])
! 
! 	else
!            
!            LIBS=${ORIG_LIBS}
! 
! 	   AC_CHECK_HEADER([winsock.h],
! 			       [	
! 			       LIBS="${LIBS} -lwsock32"
! 			       AC_TRY_LINK(
! 			       [
! 			       #include <winsock.h>
! 			       #include <windows.h>
! 			       ],
! 			       [
! 					short winsock_version;
! 					WSADATA startup_data;
! 
! 					winsock_version = MAKEWORD (2, 0);
! 					WSAStartup(winsock_version, &startup_data);
! 					WSAGetLastError();
! 					socket (AF_INET, SOCK_STREAM, 0);
! 				],
! 				[ac_cv_have_winsock=yes],
! 				[
! 				ac_cv_have_winsock=no;
! 				]
! 				)
! 				],
! 				[ac_cv_have_winsock=no]
! 			)
! 
! 	
! 	fi
! 
! 	if test "x${ac_cv_have_winsock}" = "xyes" ; then
! 	   AC_DEFINE(HAVE_WINSOCK_H,1, [Define to 1 you have a working winsock.h and wsock32.lib system.])
! 	else
! 	   LIBS=${ORIG_LIBS};
! 	fi
! 
!    fi
! 
!    AC_CHECK_HEADER([winver.h],
! 		[ac_cv_have_winver_h=yes],
! 		[ac_cv_have_winver_h=no],
  		[
! 			#include <windows.h>
! 		])
! 	
!    if test "x${ac_cv_have_winver_h}" = "xyes" ; then
!       AC_DEFINE(HAVE_WINVER_H,1,[Define to 1 if there is a working version of winver.h])
     fi
+ 		
+    AC_CHECK_HEADERS([toolhelp.h dos.h])
  
     AC_CACHE_CHECK([for GetTickCount],
     ac_cv_have_gettickcount,
+ 	[
  	AC_TRY_LINK([
  	      #include <windows.h>
***************
*** 671,681 ****
  	      ],
  	     [
- 		AC_DEFINE(HAVE_GETTICKCOUNT,1,[Define to 1 if you have the GetTickCount function.])
  		ac_cv_have_gettickcount=yes
  		],
  		[ac_cv_have_gettickcount=no])
! 	)
     AC_CACHE_CHECK([for QueryPerformanceCounter],
     ac_cv_have_queryperformancecounter,
  	AC_TRY_LINK([
  	      #include <windows.h>
--- 747,763 ----
  	      ],
  	     [
  		ac_cv_have_gettickcount=yes
  		],
  		[ac_cv_have_gettickcount=no])
! 	]
!     )
! 
!     if test "x${ac_cv_have_gettickcount}" = "xyes" ; then
! 	AC_DEFINE(HAVE_GETTICKCOUNT,1,[Define to 1 if you have the GetTickCount function.])
!    fi
! 
     AC_CACHE_CHECK([for QueryPerformanceCounter],
     ac_cv_have_queryperformancecounter,
+ 	[
  	AC_TRY_LINK([
  	      #include <windows.h>
***************
*** 692,705 ****
  	      ],
  	     [
- 	     AC_DEFINE(HAVE_QUERYPERFORMANCEFREQUENCY,1, [Define to 1 if you have the QueryPerformanceFrequency  function.])
- 	     AC_DEFINE(HAVE_QUERYPERFORMANCECOUNTER,1,[Define to 1 if you have the QueryPerformanceCounter  function.])
  	     ac_cv_have_queryperformancecounter=yes
  	     ],
  	     [ac_cv_have_queryperformancecounter=no]
  	     )
! 	 )
     AC_CACHE_CHECK([for SleepEx],
     ac_cv_have_sleepex,
!             AC_TRY_LINK([
  	      #include <windows.h>
  	      #include <winbase.h>
--- 774,794 ----
  	      ],
  	     [
  	     ac_cv_have_queryperformancecounter=yes
  	     ],
  	     [ac_cv_have_queryperformancecounter=no]
  	     )
! 	 ]
!     )
! 
! 
!     if test "x${ac_cv_have_queryperformancecounter}" = "xyes" ; then
!        AC_DEFINE(HAVE_QUERYPERFORMANCEFREQUENCY,1, [Define to 1 if you have the QueryPerformanceFrequency  function.])
!        AC_DEFINE(HAVE_QUERYPERFORMANCECOUNTER,1,[Define to 1 if you have the QueryPerformanceCounter  function.])
!     fi
! 
     AC_CACHE_CHECK([for SleepEx],
     ac_cv_have_sleepex,
!             [
! 	    AC_TRY_LINK([
  	      #include <windows.h>
  	      #include <winbase.h>
***************
*** 709,721 ****
  	      ],
  	     [
- 		AC_DEFINE(HAVE_SLEEPEX,1,[Define to 1 if you have the SleepEx function.])
  		ac_cv_have_sleepex=yes
  		],
  		[ac_cv_have_sleepex=no]
  	     )
! 	 )
     AC_CACHE_CHECK([for Yield],
     ac_cv_have_yield,
!             AC_TRY_LINK([
  	      #include <windows.h>
  	      #include <winbase.h>
--- 798,816 ----
  	      ],
  	     [
  		ac_cv_have_sleepex=yes
  		],
  		[ac_cv_have_sleepex=no]
  	     )
! 	   ]
!    )
! 
!    if test "x${ac_cv_have_sleepex}" = "xyes" ; then
!       AC_DEFINE(HAVE_SLEEPEX,1,[Define to 1 if you have the SleepEx function.])
!    fi
! 
     AC_CACHE_CHECK([for Yield],
     ac_cv_have_yield,
!             [
! 	    AC_TRY_LINK([
  	      #include <windows.h>
  	      #include <winbase.h>
***************
*** 725,739 ****
  	      ],
  	     [
- 		AC_DEFINE(HAVE_YIELD,1,[Define to 1 if you have the Yield function.])
  		ac_cv_have_yield=yes
  		],
  		[ac_cv_have_yield=no]
  	     )
  	 )
  
! }
! fi
! 
  
  
  AC_LANG_PUSH(C++)
--- 820,835 ----
  	      ],
  	     [
  		ac_cv_have_yield=yes
  		],
  		[ac_cv_have_yield=no]
  	     )
+ 	    ]
  	 )
  
!     if test "x${ac_cv_have_yield}" = "xyes" ; then
!    	AC_DEFINE(HAVE_YIELD,1,[Define to 1 if you have the Yield function.])
!     fi
  
+ fi
  
  AC_LANG_PUSH(C++)
***************
*** 750,753 ****
--- 846,903 ----
  AC_STRUCT_TM
  AC_TYPE_UID_T
+ AC_CHECK_TYPE([caddr_t])
+ 
+ if test "x${check_for_windows_stuff}" = "xyes" ; then
+ 
+    AC_CHECK_TYPE([u_int],
+ 		       [ac_cv_have_u_int=yes],
+ 		       [ac_cv_have_u_int=no],
+ 		       [
+ 		       #include <windows.h>
+ 		       #if HAVE_WINSOCK2_H
+ 		       #include <winsock2.h>
+ 		       #endif
+ 		       ])
+      if test "x${ac_cv_have_u_int}" = "xyes" ; then	
+ 	AC_DEFINE(HAVE_U_INT,1,[Define to 1 if you have the u_int type])
+      fi
+ 
+ 
+        AC_CHECK_TYPE([u_short],
+ 		       [ac_cv_have_u_short=yes],
+ 		       [ac_cv_have_u_short=yes],
+ 		       [
+ 		       #include <windows.h>
+ 		       #if HAVE_WINSOCK2_H
+ 		       #include <winsock2.h>
+ 		       #endif
+ 		       ])
+      
+      if test "x${ac_cv_have_u_short}" = "xyes" ; then	
+ 	AC_DEFINE(HAVE_U_SHORT,1,[Define to 1 if you have the u_short type])
+      fi
+ 
+ 
+      AC_CHECK_TYPE([u_long],
+ 		       [ac_cv_have_u_long=yes],
+ 		       [ac_cv_have_u_long=yes],
+ 		       [
+ 		       #include <windows.h>
+ 		       #if HAVE_WINSOCK2_H
+ 		       #include <winsock2.h>
+ 		       #endif
+ 		       ])
+ 
+      if test "x${ac_cv_have_u_long}" = "xyes" ; then	
+ 	AC_DEFINE(HAVE_U_LONG,1,[Define to 1 if you have the u_int type])
+      fi
+ 
+ else 
+      AC_CHECK_TYPE([u_int])
+      AC_CHECK_TYPE([u_long])
+      AC_CHECK_TYPE([u_short])
+ 
+ fi
+ 
  AC_CHECK_TYPE([union semun],
  		     [AC_DEFINE(HAVE_UNION_SEMUN,1,[Is union semun defined])],
***************
*** 769,781 ****
  AC_PROG_GCC_TRADITIONAL
  
- if test "x${with_libpthread}" = "xyes" ; then
-    AC_CHECK_LIB(pthread,pthread_create)
- fi
- 
  AC_SEARCH_LIBS(xdrmem_create,[rpc rpcsvc xdr nsl rpcS])
  AC_SEARCH_LIBS(xdr_short,[rpc rpcsvc xdr nsl rpcS])
! AC_SEARCH_LIBS(socket,[socket xnet])
  AC_CHECK_LIB(m,fabs)
! AC_SEARCH_LIBS(gethostbyname,[nsl resolv xnet])
  
  if test "x${with_librt}" = "xyes" ; then
--- 919,927 ----
  AC_PROG_GCC_TRADITIONAL
  
  AC_SEARCH_LIBS(xdrmem_create,[rpc rpcsvc xdr nsl rpcS])
  AC_SEARCH_LIBS(xdr_short,[rpc rpcsvc xdr nsl rpcS])
! AC_SEARCH_LIBS(socket,[socket xnet ws2_32 winsock])
  AC_CHECK_LIB(m,fabs)
! AC_SEARCH_LIBS(gethostbyname,[socket nsl resolv xnet])
  
  if test "x${with_librt}" = "xyes" ; then
***************
*** 792,800 ****
  
  
! AC_CHECK_FUNCS([atexit bzero clock_gettime floor getcwd gethostbyaddr gethostbyname gethostname getpass gettimeofday getwd inet_ntoa localtime_r memmove memset select socket sqrt strchr strcspn strdup strerror strpbrk strrchr strstr strtol strtoul toupper uname sysinfo sysconf sleep usleep nanosleep  setitimer sincos fstat opendir readdir])
  
  if test "x${with_libpthread}" = "xyes" ; then
  
!    AC_MSG_NOTICE([checking POSIX threads])
  
  AC_CHECK_FUNC(pthread_create,
--- 938,959 ----
  
  
! AC_CHECK_FUNCS([clock_gettime getcwd gethostbyaddr gethostbyname gethostname gettimeofday getwd inet_ntoa select socket sqrt strchr strcspn strdup strerror strpbrk strrchr strstr strtol strtoul toupper uname sysinfo sysconf sleep usleep nanosleep setitimer sincos fstat opendir readdir])
! 
! if test "x${with_posix_threads}" = "xno" ; then
!    with_libpthread=no;
! fi
! 
! if test "x${with_posix_threads}" = "xyes" ; then
! 
! AC_MSG_NOTICE([checking POSIX threads])
! 
! AC_CHECK_HEADER([pthread.h])
  
  if test "x${with_libpthread}" = "xyes" ; then
+    AC_CHECK_LIB(pthread,pthread_create)
+ fi
  
! 
! AC_CHECK_HEADER(pthread.h)
  
  AC_CHECK_FUNC(pthread_create,
***************
*** 802,810 ****
  [AC_CHECK_FUNC(pthread_join,
  [AC_CHECK_FUNC(pthread_exit,
! 	[AC_DEFINE(POSIX_THREADS,1,[if we should use POSIX threads])],
! 	[AC_DEFINE(NO_THREADS,1,[if no thread system is available])
! 	   CPPFLAGS="${CPPFLAGS} -DNO_THREADS"
! 	   AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
! ])
  # AC_CHECK_FUNC pthread_exit
  ])
--- 961,968 ----
  [AC_CHECK_FUNC(pthread_join,
  [AC_CHECK_FUNC(pthread_exit,
! 	[AC_DEFINE(POSIX_THREADS,1,[if we should use POSIX threads])
! 	use_pthreads=yes
! 	]
! )
  # AC_CHECK_FUNC pthread_exit
  ])
***************
*** 815,823 ****
  # AC_CHECK_FUNC pthread_create
  
  else
  
! 	AC_DEFINE(NO_THREADS,1,[if no thread system is available])
! 	CPPFLAGS="${CPPFLAGS} -DNO_THREADS"
! 	AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  fi
  
--- 973,1073 ----
  # AC_CHECK_FUNC pthread_create
  
+ if test "x${use_pthreads}" != "xyes" ; then
+ 
+ 	if test "x${check_for_windows_stuff}" = "xyes" ; then
+ 
+ 	   AC_CHECK_HEADER([process.h],	   
+ 	   [
+ 	   AC_TRY_LINK([		   
+ 	      #include <windows.h>
+ 	      #if HAVE_WINBASE_H
+ 	      #include <winbase.h>
+ 	      #endif
+ 	      #include <process.h>
+ 	      ],
+ 	      [
+ 	       _beginthread (0,0,0);
+ 	       TerminateThread ((HANDLE) 0, 0);
+ 	      ],
+ 	      [have_windows_thread_funcs=yes])
+ 	   ])
+ 	   if test "x${have_windows_thread_funcs}" = "xyes" ; then
+ 	      AC_DEFINE(HAVE_PROCESS_H,1,[Define to 1 if you have the process.h file])
+ 	      AC_DEFINE(HAVE__BEGINTHREAD,1,[Define to 1 if you have the _beginthread function.])
+ 	      AC_DEFINE(HAVE_TERMINATETHREAD,1,[Define to 1 if you have the TerminateThread function])
+ 	      AC_MSG_NOTICE([Using WIN32 Thread API.])
+ 
+ 	   fi
+ 	fi
+ 
+ 	if test "x${have_windows_thread_funcs}" != "xyes" ; then
+ 
+ 	   AC_CHECK_FUNC(fork,
+ 	   [AC_CHECK_FUNC(kill,	
+ 	   [AC_CHECK_FUNC(waitpid,
+ 		[can_use_fork=yes])
+ 	    ])])
+ 	 
+ 	   if test "x${can_use_fork}" = "xyes" ; then
+ 	 
+ 		AC_DEFINE(NO_THREADS,1,[if no thread system is available])
+ 		CPPFLAGS="${CPPFLAGS} -DNO_THREADS"
+ 		AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
+ 
+ 	   else
+ 		AC_MSG_ERROR([NO Threads implementation seems to be available
+ and even fork will not work.]);
+            fi   
+ 	fi
+ 
+ fi
+ 
  else
  
! 	if test "x${check_for_windows_stuff}" = "xyes" ; then
! 
! 	   AC_CHECK_HEADER([process.h],	   
! 	   [
! 	   AC_TRY_LINK([		   
! 	      #include <windows.h>
! 	      #if HAVE_WINBASE_H
! 	      #include <winbase.h>
! 	      #endif
! 	      #include <process.h>
! 	      ],
! 	      [
! 	       _beginthread (0,0,0);
! 	       TerminateThread ((HANDLE) 0, 0);
! 	      ],
! 	      [have_windows_thread_funcs=yes])
! 	   ])
! 	   if test "x${have_windows_thread_funcs}" = "xyes" ; then
! 	      AC_DEFINE(HAVE_PROCESS_H,1,[Define to 1 if you have the process.h file])
! 	      AC_DEFINE(HAVE__BEGINTHREAD,1,[Define to 1 if you have the _beginthread function.])
! 	      AC_DEFINE(HAVE_TERMINATETHREAD,1,[Define to 1 if you have the TerminateThread function])
! 	      AC_MSG_NOTICE([Using WIN32 Thread API.])
! 
! 	   fi
! 	fi
! 
! 	if test "x${have_windows_thread_funcs}" != "xyes" ; then
! 
! 	   AC_CHECK_FUNC(fork,
! 	   [AC_CHECK_FUNC(kill,	
! 	   [AC_CHECK_FUNC(waitpid,
! 		[can_use_fork=yes])
! 	    ])])
! 	 
! 	   if test "x${can_use_fork}" = "xyes" ; then
! 	 
! 		AC_DEFINE(NO_THREADS,1,[if no thread system is available])
! 		CPPFLAGS="${CPPFLAGS} -DNO_THREADS"
! 		AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
! 
! 	   else
! 		AC_MSG_ERROR([NO Threads implementation seems to be available
! and even fork will not work.]);
!            fi   
! 	fi
  fi
  
***************
*** 1134,1138 ****
  	   AC_MSG_NOTICE([Checking for windows shared memory.])
  	   windows_check_failed=false;
! 	   if test "x${check_for_widows_stuff}" != "xyes" ;then
  	      windows_check_failed=true
  	   fi
--- 1384,1388 ----
  	   AC_MSG_NOTICE([Checking for windows shared memory.])
  	   windows_check_failed=false;
! 	   if test "x${check_for_windows_stuff}" != "xyes" ;then
  	      windows_check_failed=true
  	   fi
***************
*** 1335,1339 ****
  		   fi
  		   if test "x${windows_check_failed}" != "xtrue" ; then
! 		      AC_MSG_NOTICE([Using windows shared memory.])
  		      windows_semaphores_available=yes;
  		   else
--- 1585,1589 ----
  		   fi
  		   if test "x${windows_check_failed}" != "xtrue" ; then
! 		      AC_MSG_NOTICE([Using windows semaphores.])
  		      windows_semaphores_available=yes;
  		   else
***************
*** 1375,1378 ****
--- 1625,1629 ----
  AC_MSG_NOTICE([ CXXFLAGS = ${CXXFLAGS} ])
  AC_MSG_NOTICE([ LDFLAGS = ${LDFLAGS} ])
+ AC_MSG_NOTICE([ LIBS = ${LIBS} ])
  AC_MSG_NOTICE([ CC = ${CC} ])
  AC_MSG_NOTICE([ CXX = ${CXX} ])
***************
*** 1381,1384 ****
--- 1632,1636 ----
  AC_SUBST(CONFIGURED_SUBDIRS)
  AC_SUBST(CONFIGURED_STATIC_LIBRARIES)
+ AC_SUBST(CONFIGURED_EXTRA_INCLUDES)
  AC_SUBST(LTLIBOBJS)
  

Index: rcs_config.h.in
===================================================================
RCS file: /cvsroot/emc/rcslib/rcs_config.h.in,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** rcs_config.h.in	18 Aug 2003 23:19:51 -0000	1.1.2.3
--- rcs_config.h.in	21 Aug 2003 20:24:13 -0000	1.1.2.4
***************
*** 7,16 ****
  #undef HAVE_ARPA_INET_H
  
- /* Define to 1 if you have the `atexit' function. */
- #undef HAVE_ATEXIT
- 
- /* Define to 1 if you have the `bzero' function. */
- #undef HAVE_BZERO
- 
  /* Define to 1 if you have the `clock_gettime' function. */
  #undef HAVE_CLOCK_GETTIME
--- 7,10 ----
***************
*** 43,49 ****
  #undef HAVE_FCNTL_H
  
- /* Define to 1 if you have the `floor' function. */
- #undef HAVE_FLOOR
- 
  /* Define to 1 if you have the `fstat' function. */
  #undef HAVE_FSTAT
--- 37,40 ----
***************
*** 61,67 ****
  #undef HAVE_GETHOSTNAME
  
- /* Define to 1 if you have the `getpass' function. */
- #undef HAVE_GETPASS
- 
  /* Define to 1 if you have the GetTickCount function. */
  #undef HAVE_GETTICKCOUNT
--- 52,55 ----
***************
*** 91,97 ****
  #undef HAVE_LIBPTHREAD
  
- /* Define to 1 if you have the `localtime_r' function. */
- #undef HAVE_LOCALTIME_R
- 
  /* Define to 1 if you have the MapViewOfFile function. */
  #undef HAVE_MAPVEIWOFFILE
--- 79,82 ----
***************
*** 100,112 ****
  #undef HAVE_MATH_H
  
- /* Define to 1 if you have the `memmove' function. */
- #undef HAVE_MEMMOVE
- 
  /* Define to 1 if you have the <memory.h> header file. */
  #undef HAVE_MEMORY_H
  
- /* Define to 1 if you have the `memset' function. */
- #undef HAVE_MEMSET
- 
  /* define if the compiler implements namespaces */
  #undef HAVE_NAMESPACES
--- 85,91 ----
***************
*** 133,138 ****
  #undef HAVE_OPENMUTEX
  
! /* Define to 1 if you have the <pthread.h> header file. */
! #undef HAVE_PTHREAD_H
  
  /* Define to 1 if you have the QueryPerformanceCounter function. */
--- 112,117 ----
  #undef HAVE_OPENMUTEX
  
! /* Define to 1 if you have the process.h file */
! #undef HAVE_PROCESS_H
  
  /* Define to 1 if you have the QueryPerformanceCounter function. */
***************
*** 148,151 ****
--- 127,139 ----
  #undef HAVE_RELEASEMUTEX
  
+ /* Define to 1 if you have the <rpc/rpc.h> header file. */
+ #undef HAVE_RPC_RPC_H
+ 
+ /* Define to 1 if you have the <rpc/types.h> header file. */
+ #undef HAVE_RPC_TYPES_H
+ 
+ /* Define to 1 if you have the <rpc/xdr.h> header file. */
+ #undef HAVE_RPC_XDR_H
+ 
  /* Is this platfrom running a linux kernel with the rtai patch */
  #undef HAVE_RTAI
***************
*** 297,300 ****
--- 285,291 ----
  #undef HAVE_SYS_XTI_H
  
+ /* Define to 1 if you have the TerminateThread function */
+ #undef HAVE_TERMINATETHREAD
+ 
  /* Define to 1 if you have the <termios.h> header file. */
  #undef HAVE_TERMIOS_H
***************
*** 321,338 ****
  #undef HAVE_USLEEP
  
  /* Define to 1 if you have the WaitForSingleObject function. */
  #undef HAVE_WAITFORSINGLEOBJECT
  
! /* Define to 1 you have a working winsock.h system. */
! #undef HAVE_WINSOCK
  
! /* Define to 1 you have a working winsock2.h system. */
! #undef HAVE_WINSOCK2
  
! /* Define to 1 if you have the <winver.h> header file. */
  #undef HAVE_WINVER_H
  
  /* Define to 1 if you have the Yield function. */
  #undef HAVE_YIELD
  
  /* if no thread system is available */
--- 312,347 ----
  #undef HAVE_USLEEP
  
+ /* Define to 1 if you have the u_int type */
+ #undef HAVE_U_INT
+ 
+ /* Define to 1 if you have the u_int type */
+ #undef HAVE_U_LONG
+ 
+ /* Define to 1 if you have the u_short type */
+ #undef HAVE_U_SHORT
+ 
  /* Define to 1 if you have the WaitForSingleObject function. */
  #undef HAVE_WAITFORSINGLEOBJECT
  
! /* Define to 1 if you have windows.h */
! #undef HAVE_WINDOWS_H
  
! /* Define to 1 you have a working winsock2.h and ws2_32.lib system. */
! #undef HAVE_WINSOCK2_H
  
! /* Define to 1 you have a working winsock.h and wsock32.lib system. */
! #undef HAVE_WINSOCK_H
! 
! /* Define to 1 if there is a working version of winver.h */
  #undef HAVE_WINVER_H
  
+ /* Define to 1 if you have the <xdr.h> header file. */
+ #undef HAVE_XDR_H
+ 
  /* Define to 1 if you have the Yield function. */
  #undef HAVE_YIELD
+ 
+ /* Define to 1 if you have the _beginthread function. */
+ #undef HAVE__BEGINTHREAD
  
  /* if no thread system is available */

[Emc-commit] rcslib/src/cms Makefile,4.50.2.2,4.50.2.3 Makefile.lib,4.56.2.1,4.56.2.2 cms_xup.cc,4.35,4.35.2.1 cms_xup.hh,4.34,4.34.2.1 http_srv.cc,1.2.2.1,1.2.2.2 http_srv.hh,1.1.2.1,1.1.2.2 httpnml.cc,1.1.2.1,1.1.2.2 recvn.c,4.36,4.36.2.1 sendn.c,4.35,4.35.2.1 sendn.h,4.33,4.33.2.1 sokintrf.h,4.34.2.1,4.34.2.2 tcp_srv.cc,4.40.2.1,4.40.2.2 tcp_srv.hh,4.33.2.1,4.33.2.2 tcpmem.cc,4.35.2.1,4.35.2.2 udp_srv.hh,4.33,4.33.2.1

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

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

Modified Files:
      Tag: wps_multiplat_dev_branch
	Makefile Makefile.lib cms_xup.cc cms_xup.hh http_srv.cc 
	http_srv.hh httpnml.cc recvn.c sendn.c sendn.h sokintrf.h 
	tcp_srv.cc tcp_srv.hh tcpmem.cc udp_srv.hh 
Log Message:
.

Index: Makefile
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/Makefile,v
retrieving revision 4.50.2.2
retrieving revision 4.50.2.3
diff -C2 -d -r4.50.2.2 -r4.50.2.3
*** Makefile	8 Aug 2003 15:08:48 -0000	4.50.2.2
--- Makefile	21 Aug 2003 20:24:14 -0000	4.50.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: Makefile.lib
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/Makefile.lib,v
retrieving revision 4.56.2.1
retrieving revision 4.56.2.2
diff -C2 -d -r4.56.2.1 -r4.56.2.2
*** Makefile.lib	8 Aug 2003 14:21:07 -0000	4.56.2.1
--- Makefile.lib	21 Aug 2003 20:24:14 -0000	4.56.2.2
***************
*** 447,450 ****
--- 447,451 ----
  	rtlnml.h \
  	cms_cfg_no_config.h \
+ 	cms_xup_no_config.h \
  	cmsdiag_no_config.h \
  	sokintrf_no_config.h \

Index: cms_xup.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/cms_xup.cc,v
retrieving revision 4.35
retrieving revision 4.35.2.1
diff -C2 -d -r4.35 -r4.35.2.1
*** cms_xup.cc	6 May 2003 15:18:14 -0000	4.35
--- cms_xup.cc	21 Aug 2003 20:24:14 -0000	4.35.2.1
***************
*** 13,21 ****
  
  /* Includes */
- extern "C"
- {
- #include <stdlib.h>		/* malloc(), free() */
  
! };
  
  #include "dbg_mem.h"		/* DEBUG_FREE,DEBUG_MALLOC,DEBUG_CALLOC */
--- 13,24 ----
  
  /* Includes */
  
! #ifdef HAVE_CONFIG_H
! #include "rcs_config_include.h"
! 
! #else
! #include "cms_xup_no_config.h"
! #endif
! // HAVE_CONFIG_H
  
  #include "dbg_mem.h"		/* DEBUG_FREE,DEBUG_MALLOC,DEBUG_CALLOC */
***************
*** 207,218 ****
    if (NULL != encode_data_stream)
      {
!       xdr_destroy (encode_data_stream);
!       DEBUG_FREE (encode_data_stream);
        encode_data_stream = (XDR *) NULL;
      }
    if (NULL != decode_data_stream)
      {
!       xdr_destroy (decode_data_stream);
!       DEBUG_FREE (decode_data_stream);
        decode_data_stream = (XDR *) NULL;
      }
--- 210,221 ----
    if (NULL != encode_data_stream)
      {
!       xdr_destroy (((XDR *)encode_data_stream));
!       DEBUG_FREE (((XDR *)encode_data_stream));
        encode_data_stream = (XDR *) NULL;
      }
    if (NULL != decode_data_stream)
      {
!       xdr_destroy (((XDR *)decode_data_stream));
!       DEBUG_FREE (((XDR *)decode_data_stream));
        decode_data_stream = (XDR *) NULL;
      }
***************
*** 288,292 ****
    else
      {
!       xdr_destroy (encode_data_stream);
      }
    if (NULL == encode_data_stream)
--- 291,295 ----
    else
      {
!       xdr_destroy (((XDR *)encode_data_stream));
      }
    if (NULL == encode_data_stream)
***************
*** 302,306 ****
    else
      {
!       xdr_destroy (decode_data_stream);
      }
    if (NULL == decode_data_stream)
--- 305,309 ----
    else
      {
!       xdr_destroy (((XDR *)decode_data_stream));
      }
    if (NULL == decode_data_stream)
***************
*** 322,328 ****
        nsize = cms_parent->enc_max_size;
      }
!   xdrmem_create (encode_data_stream, (char *) encoded_data, nsize,
  		 XDR_ENCODE);
!   xdrmem_create (decode_data_stream, (char *) encoded_data, nsize,
  		 XDR_DECODE);
  
--- 325,331 ----
        nsize = cms_parent->enc_max_size;
      }
!   xdrmem_create (((XDR *)encode_data_stream), (char *) encoded_data, nsize,
  		 XDR_ENCODE);
!   xdrmem_create (((XDR *)decode_data_stream), (char *) encoded_data, nsize,
  		 XDR_DECODE);
  
***************
*** 383,387 ****
        (mode == CMS_ENCODE_DATA) || (mode == CMS_DECODE_DATA))
      {
!       int xdr_pos = xdr_getpos (current_stream);
        if (xdr_pos + _bytes > encoded_data_size)
  	{
--- 386,390 ----
        (mode == CMS_ENCODE_DATA) || (mode == CMS_DECODE_DATA))
      {
!       int xdr_pos = xdr_getpos (((XDR *) current_stream));
        if (xdr_pos + _bytes > encoded_data_size)
  	{
***************
*** 402,406 ****
    if (NULL != current_stream)
      {
!       xdr_setpos (current_stream, 0);
      }
    else
--- 405,409 ----
    if (NULL != current_stream)
      {
!       xdr_setpos (((XDR *) current_stream), 0);
      }
    else
***************
*** 425,429 ****
        return (-1);
      }
!   return (xdr_getpos (current_stream));
  }
  
--- 428,432 ----
        return (-1);
      }
!   return (xdr_getpos (((XDR *) current_stream)));
  }
  
***************
*** 438,442 ****
        return (CMS_UPDATE_ERROR);
      }
!   if (xdr_char (current_stream, &x) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_char failed.\n");
--- 441,445 ----
        return (CMS_UPDATE_ERROR);
      }
!   if (xdr_char (((XDR *) current_stream), &x) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_char failed.\n");
***************
*** 454,458 ****
      }
  
!   if (xdr_bytes (current_stream, (char **) &x, &len, len) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_bytes failed.\n");
--- 457,461 ----
      }
  
!   if (xdr_bytes (((XDR *) current_stream), (char **) &x, &len, len) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_bytes failed.\n");
***************
*** 469,473 ****
        return (CMS_UPDATE_ERROR);
      }
!   if (xdr_u_char (current_stream, (unsigned char *) &x) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_u_char failed.\n");
--- 472,476 ----
        return (CMS_UPDATE_ERROR);
      }
!   if (xdr_u_char (((XDR *) current_stream), (unsigned char *) &x) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_u_char failed.\n");
***************
*** 485,489 ****
      }
  
!   if (xdr_bytes (current_stream, (char **) &x, &len, len) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_bytes failed.\n");
--- 488,492 ----
      }
  
!   if (xdr_bytes (((XDR *) current_stream), (char **) &x, &len, len) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_bytes failed.\n");
***************
*** 503,507 ****
      }
  
!   if (xdr_short (current_stream, &x) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_short failed.\n");
--- 506,510 ----
      }
  
!   if (xdr_short (((XDR *) current_stream), &x) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_short failed.\n");
***************
*** 519,523 ****
      }
  
!   if (xdr_vector (current_stream, (char *) x, len, sizeof (short),
  		  (xdrproc_t) xdr_short) != TRUE)
      {
--- 522,526 ----
      }
  
!   if (xdr_vector (((XDR *) current_stream), (char *) x, len, sizeof (short),
  		  (xdrproc_t) xdr_short) != TRUE)
      {
***************
*** 536,540 ****
      }
  
!   if (xdr_u_short (current_stream, &x) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_u_short failed.\n");
--- 539,543 ----
      }
  
!   if (xdr_u_short (((XDR *) current_stream), &x) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_u_short failed.\n");
***************
*** 553,557 ****
      }
  
!   if (xdr_vector (current_stream,
  		  (char *) x, len,
  		  sizeof (unsigned short), (xdrproc_t) xdr_u_short) != TRUE)
--- 556,560 ----
      }
  
!   if (xdr_vector (((XDR *) current_stream),
  		  (char *) x, len,
  		  sizeof (unsigned short), (xdrproc_t) xdr_u_short) != TRUE)
***************
*** 573,577 ****
      }
  
!   if (xdr_int (current_stream, &x) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_int failed.\n");
--- 576,580 ----
      }
  
!   if (xdr_int (((XDR *) current_stream), &x) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_int failed.\n");
***************
*** 587,591 ****
        return (CMS_UPDATE_ERROR);
      }
!   if (xdr_vector (current_stream, (char *) x, len, sizeof (int),
  		  (xdrproc_t) xdr_int) != TRUE)
      {
--- 590,594 ----
        return (CMS_UPDATE_ERROR);
      }
!   if (xdr_vector (((XDR *) current_stream), (char *) x, len, sizeof (int),
  		  (xdrproc_t) xdr_int) != TRUE)
      {
***************
*** 603,607 ****
      }
  
!   if (xdr_u_int (current_stream, &x) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_u_int failed.\n");
--- 606,610 ----
      }
  
!   if (xdr_u_int (((XDR *) current_stream), &x) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_u_int failed.\n");
***************
*** 618,622 ****
      }
  
!   if (xdr_vector (current_stream,
  		  (char *) x, len,
  		  sizeof (unsigned int), (xdrproc_t) xdr_u_int) != TRUE)
--- 621,625 ----
      }
  
!   if (xdr_vector (((XDR *) current_stream),
  		  (char *) x, len,
  		  sizeof (unsigned int), (xdrproc_t) xdr_u_int) != TRUE)
***************
*** 639,643 ****
      }
  
!   if (xdr_long (current_stream, &x) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_long failed.\n");
--- 642,646 ----
      }
  
!   if (xdr_long (((XDR *) current_stream), &x) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_long failed.\n");
***************
*** 654,658 ****
      }
  
!   if (xdr_vector (current_stream, (char *) x, len, sizeof (long),
  		  (xdrproc_t) xdr_long) != TRUE)
      {
--- 657,661 ----
      }
  
!   if (xdr_vector (((XDR *) current_stream), (char *) x, len, sizeof (long),
  		  (xdrproc_t) xdr_long) != TRUE)
      {
***************
*** 670,674 ****
      }
  
!   if (xdr_u_long (current_stream, &x) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_u_long failed.\n");
--- 673,677 ----
      }
  
!   if (xdr_u_long (((XDR *) current_stream), &x) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_u_long failed.\n");
***************
*** 686,690 ****
      }
  
!   if (xdr_vector (current_stream,
  		  (char *) x, len, sizeof (unsigned long),
  		  (xdrproc_t) xdr_u_long) != TRUE)
--- 689,693 ----
      }
  
!   if (xdr_vector (((XDR *) current_stream),
  		  (char *) x, len, sizeof (unsigned long),
  		  (xdrproc_t) xdr_u_long) != TRUE)
***************
*** 706,710 ****
      }
  
!   if (xdr_float (current_stream, &x) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_float failed.\n");
--- 709,713 ----
      }
  
!   if (xdr_float (((XDR *) current_stream), &x) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_float failed.\n");
***************
*** 721,725 ****
      }
  
!   if (xdr_vector (current_stream, (char *) x, len, sizeof (float),
  		  (xdrproc_t) xdr_float) != TRUE)
      {
--- 724,728 ----
      }
  
!   if (xdr_vector (((XDR *) current_stream), (char *) x, len, sizeof (float),
  		  (xdrproc_t) xdr_float) != TRUE)
      {
***************
*** 738,742 ****
      }
  
!   if (xdr_double (current_stream, &x) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_double failed.\n");
--- 741,745 ----
      }
  
!   if (xdr_double (((XDR *) current_stream), &x) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_double failed.\n");
***************
*** 753,757 ****
      }
  
!   if (xdr_vector (current_stream, (char *) x, len, sizeof (double),
  		  (xdrproc_t) xdr_double) != TRUE)
      {
--- 756,760 ----
      }
  
!   if (xdr_vector (((XDR *) current_stream), (char *) x, len, sizeof (double),
  		  (xdrproc_t) xdr_double) != TRUE)
      {
***************
*** 791,795 ****
  
  
!   if (xdr_double (current_stream, &y) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_double failed.\n");
--- 794,798 ----
  
  
!   if (xdr_double (((XDR *) current_stream), &y) != TRUE)
      {
        rcs_print_error ("CMS_XDR_UPDATER: xdr_double failed.\n");
***************
*** 828,832 ****
  
  
!   if (xdr_vector (current_stream, (char *) y, len, sizeof (double),
  		  (xdrproc_t) xdr_double) != TRUE)
      {
--- 831,835 ----
  
  
!   if (xdr_vector (((XDR *) current_stream), (char *) y, len, sizeof (double),
  		  (xdrproc_t) xdr_double) != TRUE)
      {

Index: cms_xup.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/cms_xup.hh,v
retrieving revision 4.34
retrieving revision 4.34.2.1
diff -C2 -d -r4.34 -r4.34.2.1
*** cms_xup.hh	19 Mar 2003 09:38:44 -0000	4.34
--- cms_xup.hh	21 Aug 2003 20:24:14 -0000	4.34.2.1
***************
*** 1,24 ****
  
- 
- #include "rcs_defs.hh"		/* RCS_EXPORT */
- 
- 
  #ifndef CMS_XUP_HH
  #define CMS_XUP_HH
  
- extern "C"
- {
- #ifndef NO_DCE_RPC
- #include <rpc/rpc.h>		/* struct XDR */
- #else
- #if defined(VXWORKS) || defined(irix6)
- #include <rpc/types.h>
- #include <rpc/xdr.h>		// struct XDR
- #else
- #include "xdr.h"
- #endif
- #endif
- 
- }
  #include "cms_up.hh"		/* class CMS_UPDATER */
  
--- 1,6 ----
***************
*** 58,68 ****
      virtual ~ CMS_XDR_UPDATER ();
    friend class RCS_EXPORT CMS;
!   XDR *encode_data_stream;	/* XDR streams for data */
!   XDR *decode_data_stream;
!   XDR *encode_header_stream;	/* XDR streams for header */
!   XDR *decode_header_stream;
!   XDR *encode_queuing_header_stream;	/* XDR streams for header */
!   XDR *decode_queuing_header_stream;
!   XDR *current_stream;
  };
  
--- 40,50 ----
      virtual ~ CMS_XDR_UPDATER ();
    friend class RCS_EXPORT CMS;
!   void *encode_data_stream;	/* XDR streams for data */
!   void *decode_data_stream;
!   void *encode_header_stream;	/* XDR streams for header */
!   void *decode_header_stream;
!   void *encode_queuing_header_stream;	/* XDR streams for header */
!   void *decode_queuing_header_stream;
!   void *current_stream;
  };
  

Index: http_srv.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/http_srv.cc,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** http_srv.cc	8 Aug 2003 14:21:10 -0000	1.2.2.1
--- http_srv.cc	21 Aug 2003 20:24:14 -0000	1.2.2.2
***************
*** 5,11 ****
  ****************************************************************************/
  
- #include "rcs_defs.hh"		/* EXTERN_C_STD_HEADERS */
- #include "sokintrf.h"		/* dl_ioctl() */
- 
  
  #if HAVE_CONFIG_H
--- 5,8 ----
***************
*** 13,74 ****
  
  #else
! 
! #ifdef EXTERN_C_STD_HEADERS
! extern "C"
! {
! #endif
! 
! #include <string.h>		/* memset(), strerror() */
! #include <stdlib.h>		// malloc(), free()
! #include <sys/types.h>
! #include <sys/stat.h>
! #include <fcntl.h>
! #include <unistd.h>
! #include <dirent.h>
! #include <errno.h>		/* errno */
! #include <signal.h>		// SIGPIPE, signal()
! 
! #if (defined(__CENTERLINE__) && !defined(VXWORKS)) || defined(sunos5) || defined(sparcworks)
! #include <sys/filio.h>		/* FIONREAD */
!   char *strerror (int errnum);
!   char *dl_inet_ntoa (struct in_addr);
! #endif
! 
! #ifdef EXTERN_C_STD_HEADERS
! }
! #endif
! 
! 
! #ifdef VXWORKS
! #include "vxWorks.h"
! #include "taskLib.h"		// taskSpawn
! #endif
! 
! #ifdef UNIX_LIKE_PLAT
! #include <sys/types.h>
! #include <sys/wait.h>		// waitpid
! #endif
! 
! #ifndef NO_THREADS
! #ifdef SGI
! #include <sys/resource.h>
! #include <sys/prctl.h>		// sproc(), prctl()
! #endif
! 
! 
! #ifdef WIN32
! #ifdef MULTITHREADED
! #include <process.h>		// _beginthread
! #else
! #define NO_THREADS
! #endif
! #endif
! #endif
! 
  
  #endif				// HAVE_CONFIG_H
  
  #include "cms.hh"		/* class CMS */
- #include "nml.hh"		// class NML
  #include "http_srv.hh"		/* class CMS_SERVER_REMOTE_HTTP_PORT */
  #include "rcs_prnt.hh"		/* rcs_print_error() */
--- 10,18 ----
  
  #else
! #include "http_svr_no_config.h"
  
  #endif				// HAVE_CONFIG_H
  
  #include "cms.hh"		/* class CMS */
  #include "http_srv.hh"		/* class CMS_SERVER_REMOTE_HTTP_PORT */
  #include "rcs_prnt.hh"		/* rcs_print_error() */
***************
*** 78,81 ****
--- 22,27 ----
  #include "_timer.h"
  #include "cmsdiag.hh"		// class CMS_DIAGNOSTICS_INFO
+ #include "sokintrf.h"		/* dl_ioctl() */
+ 
  
  extern "C"
***************
*** 85,88 ****
--- 31,77 ----
  }
  
+ class CLIENT_HTTP_PORT
+ {
+ public:
+   CLIENT_HTTP_PORT ();
+   ~CLIENT_HTTP_PORT ();
+   long serial_number;
+   int errors, max_errors;
+   struct sockaddr_in * ptr_to_address;
+   int socket_fd;
+   RCS_LINKED_LIST *subscriptions;
+ 
+   int blocking;
+   
+   //   HTTPSVR_BLOCKING_READ_REQUEST *blocking_read_req;
+   char unprocessed_request[2048];
+   char *ptr_to_end_recieved_request;
+ 
+   REMOTE_SET_DIAG_INFO_REQUEST *diag_info;
+ 
+ #if defined(WIN32) && !defined(gnuwin32)
+   DWORD tid;
+   DWORD pid;
+ #else
+ #ifdef VXWORKS
+   int tid;
+   int pid;
+ #else
+   pid_t tid;
+   pid_t pid;
+ #endif
+ #endif
+ #if defined(sunos5) && !defined(NO_THREADS)
+   thread_t threadId;
+ #else
+ #ifdef POSIX_THREADS
+   pthread_t threadId;
+ #else
+   int threadId;
+ #endif
+ #endif
+ 
+ };
+ 
  #ifdef HAVE_SNPRINTF
  #define http_srv_safer_snprintf snprintf
***************
*** 205,212 ****
      }
  
!   memset (&server_socket_address, 0, sizeof (server_socket_address));
!   server_socket_address.sin_family = AF_INET;
!   server_socket_address.sin_addr.s_addr = dl_htonl (INADDR_ANY);
!   server_socket_address.sin_port = 0;
  
    client_ports = new RCS_LINKED_LIST;
--- 194,202 ----
      }
  
!   ptr_to_server_socket_address = new struct sockaddr_in;
!   memset (ptr_to_server_socket_address, 0, sizeof (struct sockaddr_in));
!   ((struct sockaddr_in*)ptr_to_server_socket_address)->sin_family = AF_INET;
!   ((struct sockaddr_in*)ptr_to_server_socket_address)->sin_addr.s_addr = dl_htonl (INADDR_ANY);
!   ((struct sockaddr_in*)ptr_to_server_socket_address)->sin_port = 0;
  
    client_ports = new RCS_LINKED_LIST;
***************
*** 217,223 ****
      }
    polling_enabled = 0;
!   memset (&select_timeout, 0, sizeof (select_timeout));
!   select_timeout.tv_sec = 30;
!   select_timeout.tv_usec = 30;
    subscription_buffers = NULL;
    current_poll_interval_millis = 30000;
--- 207,214 ----
      }
    polling_enabled = 0;
!   ptr_to_select_timeout = new struct timeval;
!   memset (ptr_to_select_timeout, 0, sizeof (struct timeval));
!   ((struct timeval*)ptr_to_select_timeout)->tv_sec = 30;
!   ((struct timeval*)ptr_to_select_timeout)->tv_usec = 30;
    subscription_buffers = NULL;
    current_poll_interval_millis = 30000;
***************
*** 234,237 ****
--- 225,238 ----
        client_ports = (RCS_LINKED_LIST *) NULL;
      }
+   if(ptr_to_server_socket_address)
+     {
+       free(ptr_to_server_socket_address);
+       ptr_to_server_socket_address=0;
+     }
+   if(ptr_to_select_timeout)
+     {
+       free(ptr_to_select_timeout);
+       ptr_to_select_timeout=0;
+     }
  }
  
***************
*** 299,304 ****
    while (NULL != client)
      {
!       rcs_print ("Exiting even though client on %s is still connected.\n",
! 		 dl_inet_ntoa (client->address.sin_addr));
        client = (CLIENT_HTTP_PORT *) client_ports->get_next ();
        number_of_connected_clients++;
--- 300,308 ----
    while (NULL != client)
      {
!       if( NULL != client->ptr_to_address)
! 	{
! 	  rcs_print ("Exiting even though client on %s is still connected.\n",
! 		     dl_inet_ntoa (((struct sockaddr_in*)client->ptr_to_address)->sin_addr));
! 	}
        client = (CLIENT_HTTP_PORT *) client_ports->get_next ();
        number_of_connected_clients++;
***************
*** 366,377 ****
        max_total_subdivisions = _cms->total_subdivisions;
      }
!   if (server_socket_address.sin_port == 0)
      {
!       server_socket_address.sin_port =
  	dl_htons (((u_short) _cms->http_port_number));
        port_num = _cms->http_port_number;
        return 1;
      }
!   if (server_socket_address.sin_port ==
        dl_htons (((u_short) _cms->http_port_number)))
      {
--- 370,381 ----
        max_total_subdivisions = _cms->total_subdivisions;
      }
!   if (((struct sockaddr_in*)ptr_to_server_socket_address)->sin_port == 0)
      {
!       ((struct sockaddr_in*)ptr_to_server_socket_address)->sin_port =
  	dl_htons (((u_short) _cms->http_port_number));
        port_num = _cms->http_port_number;
        return 1;
      }
!   if (((struct sockaddr_in*)ptr_to_server_socket_address)->sin_port ==
        dl_htons (((u_short) _cms->http_port_number)))
      {
***************
*** 388,393 ****
    rcs_print_debug (PRINT_CMS_CONFIG_INFO,
  		   "Registering server on HTTP port %d.\n",
! 		   dl_ntohs (server_socket_address.sin_port));
!   if (server_socket_address.sin_port == 0)
      {
        rcs_print_error ("server can not register on port number 0.\n");
--- 392,397 ----
    rcs_print_debug (PRINT_CMS_CONFIG_INFO,
  		   "Registering server on HTTP port %d.\n",
! 		   dl_ntohs (((struct sockaddr_in*)ptr_to_server_socket_address)->sin_port));
!   if (((struct sockaddr_in*)ptr_to_server_socket_address)->sin_port == 0)
      {
        rcs_print_error ("server can not register on port number 0.\n");
***************
*** 405,415 ****
        return;
      }
!   if (dl_bind (connection_socket, (struct sockaddr *) &server_socket_address,
! 	       sizeof (server_socket_address)) < 0)
      {
        rcs_print_error ("bind error: %d -- %s\n", errno, strerror (errno));
        rcs_print_error
  	("Server can not bind the connection socket on port %d.\n",
! 	 dl_ntohs (server_socket_address.sin_port));
        return;
      }
--- 409,419 ----
        return;
      }
!   if (dl_bind (connection_socket, (struct sockaddr *) ptr_to_server_socket_address,
! 	       sizeof (struct sockaddr_in)) < 0)
      {
        rcs_print_error ("bind error: %d -- %s\n", errno, strerror (errno));
        rcs_print_error
  	("Server can not bind the connection socket on port %d.\n",
! 	 dl_ntohs (((struct sockaddr_in*)ptr_to_server_socket_address)->sin_port));
        return;
      }
***************
*** 418,422 ****
        rcs_print_error ("listen error: %d -- %s\n", errno, strerror (errno));
        rcs_print_error ("HTTP Server: error on call to listen for port %d.\n",
! 		       dl_ntohs (server_socket_address.sin_port));
        return;
      }
--- 422,426 ----
        rcs_print_error ("listen error: %d -- %s\n", errno, strerror (errno));
        rcs_print_error ("HTTP Server: error on call to listen for port %d.\n",
! 		       dl_ntohs (((struct sockaddr_in*)ptr_to_server_socket_address)->sin_port));
        return;
      }
***************
*** 449,458 ****
    RCS_FD_SET (connection_socket, &read_fd_set);
    maxfdpl = connection_socket + 1;
! #ifndef DOS_WINDOWS
    signal (SIGPIPE, handle_pipe_error);
  #endif
    rcs_print_debug (PRINT_CMS_CONFIG_INFO,
  		   "running server for HTTP port %d (connection_socket = %d).\n",
! 		   dl_ntohs (server_socket_address.sin_port),
  		   connection_socket);
  
--- 453,462 ----
    RCS_FD_SET (connection_socket, &read_fd_set);
    maxfdpl = connection_socket + 1;
! #if !defined(DOS_WINDOWS) && !defined(WIN32)
    signal (SIGPIPE, handle_pipe_error);
  #endif
    rcs_print_debug (PRINT_CMS_CONFIG_INFO,
  		   "running server for HTTP port %d (connection_socket = %d).\n",
! 		   dl_ntohs (((struct sockaddr_in*)ptr_to_server_socket_address)->sin_port),
  		   connection_socket);
  
***************
*** 469,478 ****
  	  memcpy (&read_fd_set_copy, &read_fd_set, sizeof (fd_set));
  	  memcpy (&write_fd_set_copy, &write_fd_set, sizeof (fd_set));
! 	  select_timeout.tv_sec = current_poll_interval_millis / 1000;
! 	  select_timeout.tv_usec =
  	    (current_poll_interval_millis % 1000) * 1000;
  	  ready_descriptors =
  	    dl_select (maxfdpl, &read_fd_set, &write_fd_set, (fd_set *) NULL,
! 		       (timeval *) & select_timeout);
  	  if (ready_descriptors == 0)
  	    {
--- 473,482 ----
  	  memcpy (&read_fd_set_copy, &read_fd_set, sizeof (fd_set));
  	  memcpy (&write_fd_set_copy, &write_fd_set, sizeof (fd_set));
! 	  ((struct timeval*)ptr_to_select_timeout)->tv_sec = current_poll_interval_millis / 1000;
! 	  ((struct timeval*)ptr_to_select_timeout)->tv_usec =
  	    (current_poll_interval_millis % 1000) * 1000;
  	  ready_descriptors =
  	    dl_select (maxfdpl, &read_fd_set, &write_fd_set, (fd_set *) NULL,
! 		       (timeval *) ptr_to_select_timeout);
  	  if (ready_descriptors == 0)
  	    {
***************
*** 522,526 ****
  				   "Socket closed by host with IP address %s.\n",
  				   dl_inet_ntoa
! 				   (client_port_to_check->address.sin_addr));
  #if 0
  		  if (NULL != client_port_to_check->subscriptions)
--- 526,530 ----
  				   "Socket closed by host with IP address %s.\n",
  				   dl_inet_ntoa
! 				   (((struct sockaddr_in*)client_port_to_check->ptr_to_address)->sin_addr));
  #if 0
  		  if (NULL != client_port_to_check->subscriptions)
***************
*** 595,600 ****
  					   "Data recieved from %s:%d when it should be blocking (bytes_ready=%d).\n",
  					   dl_inet_ntoa
! 					   (client_port_to_check->address.
! 					    sin_addr),
  					   client_port_to_check->socket_fd,
  					   bytes_ready);
--- 599,603 ----
  					   "Data recieved from %s:%d when it should be blocking (bytes_ready=%d).\n",
  					   dl_inet_ntoa
! 					   (((struct sockaddr_in*)client_port_to_check->ptr_to_address)->sin_addr),
  					   client_port_to_check->socket_fd,
  					   bytes_ready);
***************
*** 636,643 ****
  	  int client_address_length;
  	  new_client_port = new CLIENT_HTTP_PORT ();
! 	  client_address_length = sizeof (new_client_port->address);
  	  new_client_port->socket_fd = dl_accept (connection_socket,
  						  (struct sockaddr *)
! 						  &new_client_port->address,
  						  &client_address_length);
  	  current_clients++;
--- 639,646 ----
  	  int client_address_length;
  	  new_client_port = new CLIENT_HTTP_PORT ();
! 	  client_address_length = sizeof (struct sockaddr_in);
  	  new_client_port->socket_fd = dl_accept (connection_socket,
  						  (struct sockaddr *)
! 						  new_client_port->ptr_to_address,
  						  &client_address_length);
  	  current_clients++;
***************
*** 653,657 ****
  	  rcs_print_debug (PRINT_SOCKET_CONNECT,
  			   "Socket opened by host with IP address %s.\n",
! 			   dl_inet_ntoa (new_client_port->address.sin_addr));
  	  new_client_port->serial_number = 0;
  	  new_client_port->blocking = 0;
--- 656,660 ----
  	  rcs_print_debug (PRINT_SOCKET_CONNECT,
  			   "Socket opened by host with IP address %s.\n",
! 			   dl_inet_ntoa (((struct sockaddr_in*)new_client_port->ptr_to_address)->sin_addr));
  	  new_client_port->serial_number = 0;
  	  new_client_port->blocking = 0;
***************
*** 971,975 ****
        rcs_print_error ("Can not read from client port (%d) from %s\n",
  		       _client_http_port->socket_fd,
! 		       dl_inet_ntoa (_client_http_port->address.sin_addr));
        _client_http_port->errors++;
        return;
--- 974,978 ----
        rcs_print_error ("Can not read from client port (%d) from %s\n",
  		       _client_http_port->socket_fd,
! 		       dl_inet_ntoa (((struct sockaddr_in*)_client_http_port->ptr_to_address)->sin_addr));
        _client_http_port->errors++;
        return;
***************
*** 1131,1135 ****
  				_client_http_port->socket_fd;
  			      server->read_req.clientid.long_id[1] =
! 				(long) _client_http_port->address.sin_port;
  			      server->read_req.clientid.use_me = 0;
  			    }
--- 1134,1138 ----
  				_client_http_port->socket_fd;
  			      server->read_req.clientid.long_id[1] =
! 				(long) ((struct sockaddr_in*)_client_http_port->ptr_to_address)->sin_port;
  			      server->read_req.clientid.use_me = 0;
  			    }
***************
*** 1143,1149 ****
  			      lp->cms->current_alias = 0;
  			      server->read_req.clientid.long_id[0] = (long)
! 				_client_http_port->address.sin_addr.s_addr;
  			      server->read_req.clientid.long_id[1] = (long)
! 				_client_http_port->address.sin_addr.s_addr;
  			      server->read_req.clientid.use_me = 1;
  			    }
--- 1146,1152 ----
  			      lp->cms->current_alias = 0;
  			      server->read_req.clientid.long_id[0] = (long)
! 				((struct sockaddr_in*)_client_http_port->ptr_to_address)->sin_addr.s_addr;
  			      server->read_req.clientid.long_id[1] = (long)
! 				((struct sockaddr_in*)_client_http_port->ptr_to_address)->sin_addr.s_addr;
  			      server->read_req.clientid.use_me = 1;
  			    }
***************
*** 1169,1173 ****
  					  server->read_req.clientid.
  					    long_id[1] =
! 					    (long) _client_http_port->address.
  					    sin_port;
  					  server->read_req.clientid.use_me =
--- 1172,1176 ----
  					  server->read_req.clientid.
  					    long_id[1] =
! 					    (long) ((struct sockaddr_in*)_client_http_port->ptr_to_address)->
  					    sin_port;
  					  server->read_req.clientid.use_me =
***************
*** 1188,1192 ****
  					  server->read_req.clientid.
  					    long_id[1] =
! 					    (long) _client_http_port->address.
  					    sin_addr.s_addr;
  					  server->read_req.clientid.use_me =
--- 1191,1195 ----
  					  server->read_req.clientid.
  					    long_id[1] =
! 					    (long) ((struct sockaddr_in*)_client_http_port->ptr_to_address)->
  					    sin_addr.s_addr;
  					  server->read_req.clientid.use_me =
***************
*** 1286,1290 ****
        char errmsg[4096];
        sprintf (errmsg, "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n<HTML><HEAD>\n<TITLE>404 Not Found</TITLE>\n</HEAD><BODY>\n<H1>Not Found</H1>\nThe requested URL %s was not found on this server.<P>\n<HR> <ADDRESS>Server at %s Port %ld</ADDRESS>\n</BODY></HTML>\n\n", uri,
! 	       dl_inet_ntoa (server_socket_address.sin_addr), connection_port);
        sendn (_client_http_port->socket_fd, errmsg, strlen (errmsg), 0, -1.0);
        dl_closesocket (_client_http_port->socket_fd);
--- 1289,1293 ----
        char errmsg[4096];
        sprintf (errmsg, "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n<HTML><HEAD>\n<TITLE>404 Not Found</TITLE>\n</HEAD><BODY>\n<H1>Not Found</H1>\nThe requested URL %s was not found on this server.<P>\n<HR> <ADDRESS>Server at %s Port %ld</ADDRESS>\n</BODY></HTML>\n\n", uri,
! 	       dl_inet_ntoa (((struct sockaddr_in*)ptr_to_server_socket_address)->sin_addr), connection_port);
        sendn (_client_http_port->socket_fd, errmsg, strlen (errmsg), 0, -1.0);
        dl_closesocket (_client_http_port->socket_fd);
***************
*** 1377,1381 ****
  	    rcs_print_error ("Can not read from client port (%d) from %s\n",
  			     _client_http_port->socket_fd,
! 			     dl_inet_ntoa (_client_http_port->address.
  					   sin_addr));
  	    _client_http_port->errors++;
--- 1380,1384 ----
  	    rcs_print_error ("Can not read from client port (%d) from %s\n",
  			     _client_http_port->socket_fd,
! 			     dl_inet_ntoa (((struct sockaddr_in*)_client_http_port->ptr_to_address)->
  					   sin_addr));
  	    _client_http_port->errors++;
***************
*** 1686,1690 ****
  		  ("Can not read from client port (%d) from %s\n",
  		   _client_http_port->socket_fd,
! 		   dl_inet_ntoa (_client_http_port->address.sin_addr));
  		_client_http_port->errors++;
  		return;
--- 1689,1693 ----
  		  ("Can not read from client port (%d) from %s\n",
  		   _client_http_port->socket_fd,
! 		   dl_inet_ntoa (((struct sockaddr_in*)_client_http_port->ptr_to_address)->sin_addr));
  		_client_http_port->errors++;
  		return;
***************
*** 1702,1706 ****
  		  ("Can not read from client port (%d) from %s\n",
  		   _client_http_port->socket_fd,
! 		   dl_inet_ntoa (_client_http_port->address.sin_addr));
  		_client_http_port->errors++;
  		return;
--- 1705,1709 ----
  		  ("Can not read from client port (%d) from %s\n",
  		   _client_http_port->socket_fd,
! 		   dl_inet_ntoa (((struct sockaddr_in*)_client_http_port->ptr_to_address)->sin_addr));
  		_client_http_port->errors++;
  		return;
***************
*** 1896,1900 ****
        server->read_req.clientid.long_id[0] = _client_http_port->socket_fd;
        server->read_req.clientid.long_id[1] = (long)
! 	_client_http_port->address.sin_port;
        server->read_req.clientid.use_me = 1;
  
--- 1899,1903 ----
        server->read_req.clientid.long_id[0] = _client_http_port->socket_fd;
        server->read_req.clientid.long_id[1] = (long)
! 	((struct sockaddr_in*)_client_http_port->ptr_to_address)->sin_port;
        server->read_req.clientid.use_me = 1;
  
***************
*** 1915,1919 ****
  	      rcs_print_error ("Can not read from client port (%d) from %s\n",
  			       _client_http_port->socket_fd,
! 			       dl_inet_ntoa (_client_http_port->address.
  					     sin_addr));
  	      _client_http_port->errors++;
--- 1918,1922 ----
  	      rcs_print_error ("Can not read from client port (%d) from %s\n",
  			       _client_http_port->socket_fd,
! 			       dl_inet_ntoa (((struct sockaddr_in*)_client_http_port->ptr_to_address)->
  					     sin_addr));
  	      _client_http_port->errors++;
***************
*** 1986,1990 ****
        server->write_req.clientid.long_id[0] = _client_http_port->socket_fd;
        server->write_req.clientid.long_id[1] = (long)
! 	_client_http_port->address.sin_port;
        server->write_req.clientid.use_me = 1;
  
--- 1989,1993 ----
        server->write_req.clientid.long_id[0] = _client_http_port->socket_fd;
        server->write_req.clientid.long_id[1] = (long)
! 	((struct sockaddr_in*)_client_http_port->ptr_to_address)->sin_port;
        server->write_req.clientid.use_me = 1;
  
***************
*** 2002,2006 ****
  	      rcs_print_error ("Can not read from client port (%d) from %s\n",
  			       _client_http_port->socket_fd,
! 			       dl_inet_ntoa (_client_http_port->address.
  					     sin_addr));
  	      _client_http_port->errors++;
--- 2005,2009 ----
  	      rcs_print_error ("Can not read from client port (%d) from %s\n",
  			       _client_http_port->socket_fd,
! 			       dl_inet_ntoa (((struct sockaddr_in*)_client_http_port->ptr_to_address)->
  					     sin_addr));
  	      _client_http_port->errors++;
***************
*** 2526,2531 ****
        current_poll_interval_millis = ((int) (clk_tck () * 1000.0));
      }
!   select_timeout.tv_sec = current_poll_interval_millis / 1000;
!   select_timeout.tv_usec = (current_poll_interval_millis % 1000) * 1000;
    dtimeout = (current_poll_interval_millis + 10) * 1000.0;
    if (dtimeout < 0.5)
--- 2529,2534 ----
        current_poll_interval_millis = ((int) (clk_tck () * 1000.0));
      }
!   ((struct timeval*)ptr_to_select_timeout)->tv_sec = current_poll_interval_millis / 1000;
!   ((struct timeval*)ptr_to_select_timeout)->tv_usec = (current_poll_interval_millis % 1000) * 1000;
    dtimeout = (current_poll_interval_millis + 10) * 1000.0;
    if (dtimeout < 0.5)
***************
*** 2721,2732 ****
    ptr_to_end_recieved_request = unprocessed_request;
    max_errors = 50;
!   address.sin_port = 0;
!   address.sin_family = AF_INET;
!   address.sin_addr.s_addr = dl_htonl (INADDR_ANY);
    socket_fd = -1;
    subscriptions = NULL;
    tid = -1;
    pid = -1;
!   //  blocking_read_req = NULL;
    threadId = 0;
    diag_info = NULL;
--- 2724,2741 ----
    ptr_to_end_recieved_request = unprocessed_request;
    max_errors = 50;
!   ptr_to_address = new struct sockaddr_in;
!   ((struct sockaddr_in*)ptr_to_address)->sin_port = 0;
!   ((struct sockaddr_in*)ptr_to_address)->sin_family = AF_INET;
!   ((struct sockaddr_in*)ptr_to_address)->sin_addr.s_addr = dl_htonl (INADDR_ANY);
    socket_fd = -1;
    subscriptions = NULL;
+ 
+ #ifndef WIN32
    tid = -1;
    pid = -1;
! #else
!   tid = 0;
!   pid = 0;
! #endif
    threadId = 0;
    diag_info = NULL;
***************
*** 2740,2743 ****
--- 2749,2758 ----
        socket_fd = -1;
      }
+   if(ptr_to_address)
+     {
+       free(ptr_to_address);
+       ptr_to_address = 0;
+     }
+ 
  #if 0
    if (NULL != subscriptions)

Index: http_srv.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/http_srv.hh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** http_srv.hh	8 Aug 2003 14:21:10 -0000	1.1.2.1
--- http_srv.hh	21 Aug 2003 20:24:14 -0000	1.1.2.2
***************
*** 5,50 ****
  #include "cms_srv.hh"		/* class CMS_SERVER_REMOTE_PORT */
  #include "linklist.hh"		/* class RCS_LINKED_LIST */
- #include "rcs_defs.hh"		/* EXTERN_C_STD_HEADERS */
  #include "sokintrf.h"		// fd_set, sockaddr_in, timeval
  #include "rem_msg.hh"
  
- #ifndef HAVE_CONFIG_H
- 
- #ifdef EXTERN_C_STD_HEADERS
- extern "C"
- {
- #endif
- 
- #include <string.h>		/* memset(), strerror() */
- #include <errno.h>		/* errno */
- #include <signal.h>		// SIGPIPE, signal()
- 
- #ifdef EXTERN_C_STD_HEADERS
- }
- #endif
- 
- #ifndef NO_THREADS
- #ifdef sunos5
- #include <thread.h>
- #endif
- 
- #ifdef linux
- #define NO_THREADS
- #endif
- 
- #ifdef NO_THREADS
- #undef POSIX_THREADS
- #endif
- 
- #ifdef POSIX_THREADS
- #include <pthread.h>
- #endif
- 
- #endif
- 
- #endif
- 
- #include "dbg_mem.h"		/* DEBUG_FREE,DEBUG_MALLOC,DEBUG_CALLOC */
- 
  #define MAX_HTTP_BUFFER_SIZE 16
  class CLIENT_HTTP_PORT;
--- 5,11 ----
***************
*** 68,179 ****
    int connection_socket;
    long connection_port;
!   struct sockaddr_in server_socket_address;
    REMOTE_CMS_REQUEST *request;
    char temp_buffer[0x2000];
    int current_poll_interval_millis;
    int polling_enabled;
!   struct timeval select_timeout;
! #if 0
!   void add_subscription_client (int buffer_number, int subscription_type,
! 				int poll_interval_millis,
! 				CLIENT_HTTP_PORT * clnt);
!   void remove_subscription_client (CLIENT_HTTP_PORT * clnt,
! 				   int buffer_number);
!   void recalculate_polling_interval ();
!   void update_subscriptions ();
!   void switch_function (CLIENT_HTTP_PORT * _client_tcp_port,
! 			CMS_SERVER * server,
! 			long request_type,
! 			long buffer_number, long received_serial_number);
! #endif
! 
! };
! 
! #if 0
! 
! class HTTP_BUFFER_SUBSCRIPTION_INFO
! {
! public:
!   HTTP_BUFFER_SUBSCRIPTION_INFO ();
!   ~HTTP_BUFFER_SUBSCRIPTION_INFO ();
!   int buffer_number;
!   int min_last_id;
!   int list_id;
!   RCS_LINKED_LIST *sub_clnt_info;
! };
! 
! class HTTP_CLIENT_SUBSCRIPTION_INFO
! {
! public:
!   HTTP_CLIENT_SUBSCRIPTION_INFO ();
!   ~HTTP_CLIENT_SUBSCRIPTION_INFO ();
!   int subscription_type;
!   int poll_interval_millis;
!   double last_sub_sent_time;
!   int subscription_list_id;
!   int buffer_number;
!   int subscription_paused;
!   int last_id_read;
!   HTTP_BUFFER_SUBSCRIPTION_INFO *sub_buf_info;
!   CLIENT_HTTP_PORT *clnt_port;
! };
! 
! class HTTPSVR_BLOCKING_READ_REQUEST;
! #endif
! 
! class CLIENT_HTTP_PORT
! {
! public:
!   CLIENT_HTTP_PORT ();
!   ~CLIENT_HTTP_PORT ();
!   long serial_number;
!   int errors, max_errors;
!   struct sockaddr_in address;
!   int socket_fd;
!   RCS_LINKED_LIST *subscriptions;
! #if defined(WIN32) && !defined(gnuwin32)
!   DWORD tid;
!   DWORD pid;
! #else
! #ifdef VXWORKS
!   int tid;
!   int pid;
! #else
!   pid_t tid;
!   pid_t pid;
! #endif
! #endif
!   int blocking;
! #if defined(sunos5) && !defined(NO_THREADS)
!   thread_t threadId;
! #else
! #ifdef POSIX_THREADS
!   pthread_t threadId;
! #else
!   int threadId;
! #endif
! #endif
!   //   HTTPSVR_BLOCKING_READ_REQUEST *blocking_read_req;
!   REMOTE_SET_DIAG_INFO_REQUEST *diag_info;
!   char unprocessed_request[2048];
!   char *ptr_to_end_recieved_request;
  
  };
- 
- #if 0 
- 
- class HTTPSVR_BLOCKING_READ_REQUEST:public REMOTE_BLOCKING_READ_REQUEST
- {
- public:
-   HTTPSVR_BLOCKING_READ_REQUEST ();
-   ~HTTPSVR_BLOCKING_READ_REQUEST ();
-   CLIENT_HTTP_PORT *_client_http_port;
-   CMS_SERVER_REMOTE_HTTP_PORT *remport;
-   CMS_SERVER *server;
-   REMOTE_BLOCKING_READ_REPLY *read_reply;
- };
- 
- #endif
- 
  
  #endif /* HTTP_SRV_HH */
--- 29,40 ----
    int connection_socket;
    long connection_port;
!   void * ptr_to_server_socket_address;
    REMOTE_CMS_REQUEST *request;
    char temp_buffer[0x2000];
    int current_poll_interval_millis;
    int polling_enabled;
!   void * ptr_to_select_timeout;
  
  };
  
  #endif /* HTTP_SRV_HH */

Index: httpnml.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/Attic/httpnml.cc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** httpnml.cc	8 Aug 2003 14:48:05 -0000	1.1.2.1
--- httpnml.cc	21 Aug 2003 20:24:14 -0000	1.1.2.2
***************
*** 176,180 ****
  	   EINPROGRESS == errno
  #else
! #ifdef _Windows
  	   WSAEWOULDBLOCK == dl_WSAGetLastError ()
  #else
--- 176,180 ----
  	   EINPROGRESS == errno
  #else
! #if defined(_Windows) || defined(WIN32)
  	   WSAEWOULDBLOCK == dl_WSAGetLastError ()
  #else
***************
*** 188,192 ****
  	)
  	{
! #ifdef _Windows
  	  tm.tv_sec = 0;
  	  tm.tv_usec = 0;
--- 188,192 ----
  	)
  	{
! #if defined(_Windows) || defined(WIN32)
  	  tm.tv_sec = 0;
  	  tm.tv_usec = 0;
***************
*** 212,216 ****
  		  return(0);
  		}
! #ifdef _Windows
  	      tm.tv_sec = 0;
  	      tm.tv_usec = 0;
--- 212,216 ----
  		  return(0);
  		}
! #if defined(_Windows) || defined(WIN32)
  	      tm.tv_sec = 0;
  	      tm.tv_usec = 0;
***************
*** 220,224 ****
  #endif
  	    }
! #if defined(_Windows) && !defined(gnuwin32)
  	  if (socket_ret == SOCKET_ERROR)
  	    {
--- 220,224 ----
  #endif
  	    }
! #if defined(_Windows) || defined(WIN32)  && !defined(gnuwin32)
  	  if (socket_ret == SOCKET_ERROR)
  	    {
***************
*** 239,243 ****
        else
  	{
! #if defined(_Windows) && !defined(gnuwin32)
  	  rcs_print_error ("connect error: %d\n", dl_WSAGetLastError ());
  #else
--- 239,243 ----
        else
  	{
! #if defined(_Windows) || defined(WIN32) && !defined(gnuwin32)
  	  rcs_print_error ("connect error: %d\n", dl_WSAGetLastError ());
  #else

Index: recvn.c
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/recvn.c,v
retrieving revision 4.36
retrieving revision 4.36.2.1
diff -C2 -d -r4.36 -r4.36.2.1
*** recvn.c	6 May 2003 15:18:15 -0000	4.36
--- recvn.c	21 Aug 2003 20:24:14 -0000	4.36.2.1
***************
*** 56,59 ****
--- 56,63 ----
    int bytes_ready;
    int bytes_to_read;
+ #if defined(WIN32) && !defined(gnuwin32)
+   unsigned long ioctlsocket_arg;
+ #endif
+ 
    if (etime_disabled)
      {
***************
*** 193,197 ****
  	  bytes_ready = 0;
  #if defined(WIN32) && !defined(gnuwin32)
! 	  dl_ioctlsocket (fd, FIONREAD, &bytes_ready);
  #else
  #ifndef VXWORKS
--- 197,203 ----
  	  bytes_ready = 0;
  #if defined(WIN32) && !defined(gnuwin32)
! 	  ioctlsocket_arg = 0;
! 	  dl_ioctlsocket (fd, FIONREAD, &ioctlsocket_arg);
! 	  bytes_ready = ((int) ioctlsocket_arg);
  #else
  #ifndef VXWORKS
***************
*** 217,221 ****
  	    {
  	      if (
! #if !defined(_WINDOWS) || defined(gnuwin32)
  #ifdef MSDOS
  		   (EWOULDBLOCK == (tk_geterrno (fd)))
--- 223,227 ----
  	    {
  	      if (
! #if ( !defined(_WINDOWS) && !defined(WIN32)) || defined(gnuwin32)
  #ifdef MSDOS
  		   (EWOULDBLOCK == (tk_geterrno (fd)))

Index: sendn.c
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/sendn.c,v
retrieving revision 4.35
retrieving revision 4.35.2.1
diff -C2 -d -r4.35 -r4.35.2.1
*** sendn.c	6 May 2003 15:18:16 -0000	4.35
--- sendn.c	21 Aug 2003 20:24:14 -0000	4.35.2.1
***************
*** 7,28 ****
  *************************************************************************/
  
- /* This is neccessary to avoid muliple definitions of fd_set, etc when both
- * RPC via PCNFS and Windows Sockets are to be available. */
- #ifdef USE_PCNFS
- #undef USE_PCNFS
- #endif
- #include "rcs_defs.hh"		/* _Windows */
  
! #if HAVE_CONFIG_H
  #include "rcs_config_include.h"
  
  #else
! 
! #include <string.h>		/* strerror */
! #include <stdlib.h>		/* memset() */
! 
! #include <errno.h>		/* errno  */
! #include <math.h>		/* fabs() */
! 
  #endif
  
--- 7,16 ----
  *************************************************************************/
  
  
! #ifdef HAVE_CONFIG_H
  #include "rcs_config_include.h"
  
  #else
! #include "sendn_no_config.h"
  #endif
  
***************
*** 37,41 ****
  
  /* Write "n" bytes to a descriptor. */
! int RCS_EXPORT
  sendn (int fd, const void *vptr, int n, int _flags, double _timeout)
  {
--- 25,29 ----
  
  /* Write "n" bytes to a descriptor. */
! int
  sendn (int fd, const void *vptr, int n, int _flags, double _timeout)
  {

Index: sendn.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/sendn.h,v
retrieving revision 4.33
retrieving revision 4.33.2.1
diff -C2 -d -r4.33 -r4.33.2.1
*** sendn.h	6 May 2003 15:18:16 -0000	4.33
--- sendn.h	21 Aug 2003 20:24:14 -0000	4.33.2.1
***************
*** 7,16 ****
  *************************************************************************/
  
! 
! 
! #ifndef WRITEN_H
! #define WRITEN_H
! 
! #include "rcs_defs.hh"		/* RCS_EXPORT */
  
  #ifdef __cplusplus
--- 7,12 ----
  *************************************************************************/
  
! #ifndef SENDN_H
! #define SENDN_H
  
  #ifdef __cplusplus
***************
*** 19,26 ****
  #endif
  
! #include <stddef.h>		/* size_t */
! 
!   int RCS_EXPORT sendn (int fd, const void *vptr, int n, int flags,
! 			double timeout);
  
  #ifdef __cplusplus
--- 15,19 ----
  #endif
  
! int sendn (int fd, const void *vptr, int n, int flags, double timeout);
  
  #ifdef __cplusplus
***************
*** 29,31 ****
  
  
! #endif /* WRITEN_H */
--- 22,24 ----
  
  
! #endif /* SENDN_H */

Index: sokintrf.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/sokintrf.h,v
retrieving revision 4.34.2.1
retrieving revision 4.34.2.2
diff -C2 -d -r4.34.2.1 -r4.34.2.2
*** sokintrf.h	8 Aug 2003 14:21:10 -0000	4.34.2.1
--- sokintrf.h	21 Aug 2003 20:24:14 -0000	4.34.2.2
***************
*** 22,26 ****
  
  
! #ifndef SOCKET_DEFINED
  #define SOCKET_DEFINED
    typedef unsigned int SOCKET;
--- 22,26 ----
  
  
! #if !defined(SOCKET_DEFINED) && !defined(HAVE_SOCKET_T) && !defined(HAVE_WINSOCK2_H)
  #define SOCKET_DEFINED
    typedef unsigned int SOCKET;
***************
*** 67,71 ****
  				char RCS_FAR * optval, int len);
    int RCS_EXPORT dl_fd_isset (SOCKET s, fd_set RCS_FAR * set);
! #ifdef _WINDOWS
    int RCS_EXPORT dl_WSAGetLastError (void);
  #endif
--- 67,71 ----
  				char RCS_FAR * optval, int len);
    int RCS_EXPORT dl_fd_isset (SOCKET s, fd_set RCS_FAR * set);
! #if defined(_WINDOWS) || defined(WIN32)
    int RCS_EXPORT dl_WSAGetLastError (void);
  #endif

Index: tcp_srv.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/tcp_srv.cc,v
retrieving revision 4.40.2.1
retrieving revision 4.40.2.2
diff -C2 -d -r4.40.2.1 -r4.40.2.2
*** tcp_srv.cc	8 Aug 2003 14:21:10 -0000	4.40.2.1
--- tcp_srv.cc	21 Aug 2003 20:24:14 -0000	4.40.2.2
***************
*** 5,11 ****
  ****************************************************************************/
  
- #include "rcs_defs.hh"		/* EXTERN_C_STD_HEADERS */
- #include "sokintrf.h"		/* dl_ioctl() */
- 
  
  #if HAVE_CONFIG_H
--- 5,8 ----
***************
*** 13,66 ****
  
  #else
! 
! #ifdef EXTERN_C_STD_HEADERS
! extern "C"
! {
! #endif
! 
! #include <string.h>		/* memset(), strerror() */
! #include <stdlib.h>		// malloc(), free()
! #include <errno.h>		/* errno */
! #include <signal.h>		// SIGPIPE, signal()
! 
! #if (defined(__CENTERLINE__) && !defined(VXWORKS)) || defined(sunos5) || defined(sparcworks)
! #include <sys/filio.h>		/* FIONREAD */
!   char *strerror (int errnum);
!   char *dl_inet_ntoa (struct in_addr);
! #endif
! 
! #ifdef EXTERN_C_STD_HEADERS
! }
! #endif
! 
! 
! #ifdef VXWORKS
! #include "vxWorks.h"
! #include "taskLib.h"		// taskSpawn
! #endif
! 
! #ifdef UNIX_LIKE_PLAT
! #include <sys/types.h>
! #include <sys/wait.h>		// waitpid
! #endif
! 
! #ifndef NO_THREADS
! #ifdef SGI
! #include <sys/resource.h>
! #include <sys/prctl.h>		// sproc(), prctl()
! #endif
! 
! 
! #ifdef WIN32
! #ifdef MULTITHREADED
! #include <process.h>		// _beginthread
! #else
! #define NO_THREADS
! #endif
! #endif
  #endif
  
! 
! #endif				// HAVE_CONFIG_H
  
  #include "cms.hh"		/* class CMS */
--- 10,17 ----
  
  #else
! #include "tcp_svr_no_config.h"
  #endif
  
! #include "sokintrf.h"		/* dl_ioctl() */
  
  #include "cms.hh"		/* class CMS */
***************
*** 80,83 ****
--- 31,87 ----
  }
  
+ class TCPSVR_BLOCKING_READ_REQUEST;
+ 
+ class CLIENT_TCP_PORT
+ {
+ public:
+   CLIENT_TCP_PORT ();
+   ~CLIENT_TCP_PORT ();
+   long serial_number;
+   int errors, max_errors;
+   struct sockaddr_in address;
+   int socket_fd;
+   RCS_LINKED_LIST *subscriptions;
+ 
+   int blocking;
+ 
+   TCPSVR_BLOCKING_READ_REQUEST *blocking_read_req;
+   REMOTE_SET_DIAG_INFO_REQUEST *diag_info;
+   int blocking_read_in_progress;
+ 
+ #if defined(WIN32) && !defined(gnuwin32)
+   DWORD tid;
+   DWORD pid;
+ #else
+ #ifdef VXWORKS
+   int tid;
+   int pid;
+ #else
+   pid_t tid;
+   pid_t pid;
+ #endif
+ #endif
+ #if defined(sunos5) && !defined(NO_THREADS)
+   thread_t threadId;
+ #else
+ #ifdef POSIX_THREADS
+   pthread_t threadId;
+ #else
+   int threadId;
+ #endif
+ #endif
+ };
+ 
+ class TCPSVR_BLOCKING_READ_REQUEST:public REMOTE_BLOCKING_READ_REQUEST
+ {
+ public:
+   TCPSVR_BLOCKING_READ_REQUEST ();
+   ~TCPSVR_BLOCKING_READ_REQUEST ();
+   CLIENT_TCP_PORT *_client_tcp_port;
+   CMS_SERVER_REMOTE_TCP_PORT *remport;
+   CMS_SERVER *server;
+   REMOTE_BLOCKING_READ_REPLY *read_reply;
+ };
+ 
  
  
***************
*** 177,184 ****
      }
  
!   memset (&server_socket_address, 0, sizeof (server_socket_address));
!   server_socket_address.sin_family = AF_INET;
!   server_socket_address.sin_addr.s_addr = dl_htonl (INADDR_ANY);
!   server_socket_address.sin_port = 0;
  
    client_ports = new RCS_LINKED_LIST;
--- 181,190 ----
      }
  
!   ptr_to_server_socket_address = new struct sockaddr_in;
! 
!   memset (ptr_to_server_socket_address, 0, sizeof (struct sockaddr_in));
!   ((struct sockaddr_in*)ptr_to_server_socket_address)->sin_family = AF_INET;
!   ((struct sockaddr_in*)ptr_to_server_socket_address)->sin_addr.s_addr = dl_htonl (INADDR_ANY);
!   ((struct sockaddr_in*)ptr_to_server_socket_address)->sin_port = 0;
  
    client_ports = new RCS_LINKED_LIST;
***************
*** 189,195 ****
      }
    polling_enabled = 0;
!   memset (&select_timeout, 0, sizeof (select_timeout));
!   select_timeout.tv_sec = 30;
!   select_timeout.tv_usec = 30;
    subscription_buffers = NULL;
    current_poll_interval_millis = 30000;
--- 195,202 ----
      }
    polling_enabled = 0;
!   ptr_to_select_timeout = new struct timeval;
!   memset (ptr_to_select_timeout, 0, sizeof (struct timeval));
!   ((struct timeval*)ptr_to_select_timeout)->tv_sec = 30;
!   ((struct timeval*)ptr_to_select_timeout)->tv_usec = 30;
    subscription_buffers = NULL;
    current_poll_interval_millis = 30000;
***************
*** 206,209 ****
--- 213,226 ----
        client_ports = (RCS_LINKED_LIST *) NULL;
      }
+   if(ptr_to_server_socket_address)
+     {
+       free(ptr_to_server_socket_address);
+       ptr_to_server_socket_address=0;
+     }
+   if(ptr_to_select_timeout)
+     {
+       free(ptr_to_select_timeout);
+       ptr_to_select_timeout=0;
+     }
  }
  
***************
*** 241,245 ****
  #endif
  #ifdef WIN32
!   TerminateThread ((HANDLE) id, -1);
  #endif
    tcpsvr_threads_killed++;
--- 258,262 ----
  #endif
  #ifdef WIN32
!   TerminateThread ((HANDLE) id, 0);
  #endif
    tcpsvr_threads_killed++;
***************
*** 332,343 ****
        max_total_subdivisions = _cms->total_subdivisions;
      }
!   if (server_socket_address.sin_port == 0)
      {
!       server_socket_address.sin_port =
  	dl_htons (((u_short) _cms->tcp_port_number));
        port_num = _cms->tcp_port_number;
        return 1;
      }
!   if (server_socket_address.sin_port ==
        dl_htons (((u_short) _cms->tcp_port_number)))
      {
--- 349,360 ----
        max_total_subdivisions = _cms->total_subdivisions;
      }
!   if (((struct sockaddr_in*)ptr_to_server_socket_address)->sin_port == 0)
      {
!       ((struct sockaddr_in*)ptr_to_server_socket_address)->sin_port =
  	dl_htons (((u_short) _cms->tcp_port_number));
        port_num = _cms->tcp_port_number;
        return 1;
      }
!   if (((struct sockaddr_in*)ptr_to_server_socket_address)->sin_port ==
        dl_htons (((u_short) _cms->tcp_port_number)))
      {
***************
*** 354,359 ****
    rcs_print_debug (PRINT_CMS_CONFIG_INFO,
  		   "Registering server on TCP port %d.\n",
! 		   dl_ntohs (server_socket_address.sin_port));
!   if (server_socket_address.sin_port == 0)
      {
        rcs_print_error ("server can not register on port number 0.\n");
--- 371,376 ----
    rcs_print_debug (PRINT_CMS_CONFIG_INFO,
  		   "Registering server on TCP port %d.\n",
! 		   dl_ntohs (((struct sockaddr_in*)ptr_to_server_socket_address)->sin_port));
!   if (((struct sockaddr_in*)ptr_to_server_socket_address)->sin_port == 0)
      {
        rcs_print_error ("server can not register on port number 0.\n");
***************
*** 371,381 ****
        return;
      }
!   if (dl_bind (connection_socket, (struct sockaddr *) &server_socket_address,
! 	       sizeof (server_socket_address)) < 0)
      {
        rcs_print_error ("bind error: %d -- %s\n", errno, strerror (errno));
        rcs_print_error
  	("Server can not bind the connection socket on port %d.\n",
! 	 dl_ntohs (server_socket_address.sin_port));
        return;
      }
--- 388,398 ----
        return;
      }
!   if (dl_bind (connection_socket, (struct sockaddr *) ptr_to_server_socket_address,
! 	       sizeof (struct sockaddr_in)) < 0)
      {
        rcs_print_error ("bind error: %d -- %s\n", errno, strerror (errno));
        rcs_print_error
  	("Server can not bind the connection socket on port %d.\n",
! 	 dl_ntohs (((struct sockaddr_in*)ptr_to_server_socket_address)->sin_port));
        return;
      }
***************
*** 384,388 ****
        rcs_print_error ("listen error: %d -- %s\n", errno, strerror (errno));
        rcs_print_error ("TCP Server: error on call to listen for port %d.\n",
! 		       dl_ntohs (server_socket_address.sin_port));
        return;
      }
--- 401,405 ----
        rcs_print_error ("listen error: %d -- %s\n", errno, strerror (errno));
        rcs_print_error ("TCP Server: error on call to listen for port %d.\n",
! 		       dl_ntohs (((struct sockaddr_in*)ptr_to_server_socket_address)->sin_port));
        return;
      }
***************
*** 415,424 ****
    RCS_FD_SET (connection_socket, &read_fd_set);
    maxfdpl = connection_socket + 1;
! #ifndef DOS_WINDOWS
    signal (SIGPIPE, handle_pipe_error);
  #endif
    rcs_print_debug (PRINT_CMS_CONFIG_INFO,
  		   "running server for TCP port %d (connection_socket = %d).\n",
! 		   dl_ntohs (server_socket_address.sin_port),
  		   connection_socket);
  
--- 432,441 ----
    RCS_FD_SET (connection_socket, &read_fd_set);
    maxfdpl = connection_socket + 1;
! #if !defined(DOS_WINDOWS) && !defined(WIN32)
    signal (SIGPIPE, handle_pipe_error);
  #endif
    rcs_print_debug (PRINT_CMS_CONFIG_INFO,
  		   "running server for TCP port %d (connection_socket = %d).\n",
! 		   dl_ntohs (((struct sockaddr_in*)ptr_to_server_socket_address)->sin_port),
  		   connection_socket);
  
***************
*** 435,444 ****
  	  memcpy (&read_fd_set_copy, &read_fd_set, sizeof (fd_set));
  	  memcpy (&write_fd_set_copy, &write_fd_set, sizeof (fd_set));
! 	  select_timeout.tv_sec = current_poll_interval_millis / 1000;
! 	  select_timeout.tv_usec =
  	    (current_poll_interval_millis % 1000) * 1000;
  	  ready_descriptors =
  	    dl_select (maxfdpl, &read_fd_set, &write_fd_set, (fd_set *) NULL,
! 		       (timeval *) & select_timeout);
  	  if (ready_descriptors == 0)
  	    {
--- 452,461 ----
  	  memcpy (&read_fd_set_copy, &read_fd_set, sizeof (fd_set));
  	  memcpy (&write_fd_set_copy, &write_fd_set, sizeof (fd_set));
! 	  ((struct timeval*)ptr_to_select_timeout)->tv_sec = current_poll_interval_millis / 1000;
! 	  ((struct timeval*)ptr_to_select_timeout)->tv_usec =
  	    (current_poll_interval_millis % 1000) * 1000;
  	  ready_descriptors =
  	    dl_select (maxfdpl, &read_fd_set, &write_fd_set, (fd_set *) NULL,
! 		       (timeval *) ptr_to_select_timeout);
  	  if (ready_descriptors == 0)
  	    {
***************
*** 537,545 ****
  		    }
  		  if (client_port_to_check->threadId > 0
! 		      && client_port_to_check->blocking)
! 		    {
! 		      tcp_srv_blocking_thread_kill (client_port_to_check->
! 						    threadId);
! 		    }
  		  dl_closesocket (client_port_to_check->socket_fd);
  		  RCS_FD_CLR (client_port_to_check->socket_fd, &read_fd_set);
--- 554,562 ----
  		    }
  		  if (client_port_to_check->threadId > 0
! 		       && client_port_to_check->blocking)
! 		  {
! 		    tcp_srv_blocking_thread_kill (client_port_to_check->
! 						  threadId);
! 		  }
  		  dl_closesocket (client_port_to_check->socket_fd);
  		  RCS_FD_CLR (client_port_to_check->socket_fd, &read_fd_set);
***************
*** 560,565 ****
  					   "Data recieved from %s:%d when it should be blocking (bytes_ready=%d).\n",
  					   dl_inet_ntoa
! 					   (client_port_to_check->address.
! 					    sin_addr),
  					   client_port_to_check->socket_fd,
  					   bytes_ready);
--- 577,581 ----
  					   "Data recieved from %s:%d when it should be blocking (bytes_ready=%d).\n",
  					   dl_inet_ntoa
! 					   (client_port_to_check->address.sin_addr),
  					   client_port_to_check->socket_fd,
  					   bytes_ready);
***************
*** 602,606 ****
  	  int client_address_length;
  	  new_client_port = new CLIENT_TCP_PORT ();
! 	  client_address_length = sizeof (new_client_port->address);
  	  new_client_port->socket_fd = dl_accept (connection_socket,
  						  (struct sockaddr *)
--- 618,622 ----
  	  int client_address_length;
  	  new_client_port = new CLIENT_TCP_PORT ();
! 	  client_address_length = sizeof (struct sockaddr_in);
  	  new_client_port->socket_fd = dl_accept (connection_socket,
  						  (struct sockaddr *)
***************
*** 1626,1631 ****
  	      rcs_print_error ("Can not read from client port (%d) from %s\n",
  			       _client_tcp_port->socket_fd,
! 			       dl_inet_ntoa (_client_tcp_port->address.
! 					     sin_addr));
  	      _client_tcp_port->errors++;
  	      return;
--- 1642,1646 ----
  	      rcs_print_error ("Can not read from client port (%d) from %s\n",
  			       _client_tcp_port->socket_fd,
! 			       dl_inet_ntoa (_client_tcp_port->address.sin_addr));
  	      _client_tcp_port->errors++;
  	      return;
***************
*** 2149,2154 ****
        current_poll_interval_millis = ((int) (clk_tck () * 1000.0));
      }
!   select_timeout.tv_sec = current_poll_interval_millis / 1000;
!   select_timeout.tv_usec = (current_poll_interval_millis % 1000) * 1000;
    dtimeout = (current_poll_interval_millis + 10) * 1000.0;
    if (dtimeout < 0.5)
--- 2164,2169 ----
        current_poll_interval_millis = ((int) (clk_tck () * 1000.0));
      }
!   ((struct timeval*)ptr_to_select_timeout)->tv_sec = current_poll_interval_millis / 1000;
!   ((struct timeval*)ptr_to_select_timeout)->tv_usec = (current_poll_interval_millis % 1000) * 1000;
    dtimeout = (current_poll_interval_millis + 10) * 1000.0;
    if (dtimeout < 0.5)
***************
*** 2344,2349 ****
--- 2359,2370 ----
    socket_fd = -1;
    subscriptions = NULL;
+ #ifndef WIN32
    tid = -1;
    pid = -1;
+ #else
+   tid = 0;
+   pid = 0;
+ #endif
+ 
    blocking_read_req = NULL;
    threadId = 0;

Index: tcp_srv.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/tcp_srv.hh,v
retrieving revision 4.33.2.1
retrieving revision 4.33.2.2
diff -C2 -d -r4.33.2.1 -r4.33.2.2
*** tcp_srv.hh	8 Aug 2003 14:21:10 -0000	4.33.2.1
--- tcp_srv.hh	21 Aug 2003 20:24:14 -0000	4.33.2.2
***************
*** 5,50 ****
  #include "cms_srv.hh"		/* class CMS_SERVER_REMOTE_PORT */
  #include "linklist.hh"		/* class RCS_LINKED_LIST */
- #include "rcs_defs.hh"		/* EXTERN_C_STD_HEADERS */
- #include "sokintrf.h"		// fd_set, sockaddr_in, timeval
  #include "rem_msg.hh"
  
- #ifndef HAVE_CONFIG_H
- 
- #ifdef EXTERN_C_STD_HEADERS
- extern "C"
- {
- #endif
- 
- #include <string.h>		/* memset(), strerror() */
- #include <errno.h>		/* errno */
- #include <signal.h>		// SIGPIPE, signal()
- 
- #ifdef EXTERN_C_STD_HEADERS
- }
- #endif
- 
- #ifndef NO_THREADS
- #ifdef sunos5
- #include <thread.h>
- #endif
- 
- #ifdef linux
- #defin...
 
[truncated message content]

[Emc-commit] rcslib/src/os_intf Makefile,4.36.2.2,4.36.2.3 _timer.c,4.42.2.2,4.42.2.3 shm.cc,4.35,4.35.2.1

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

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

Modified Files:
      Tag: wps_multiplat_dev_branch
	Makefile _timer.c shm.cc 
Log Message:
.

Index: Makefile
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/Makefile,v
retrieving revision 4.36.2.2
retrieving revision 4.36.2.3
diff -C2 -d -r4.36.2.2 -r4.36.2.3
*** Makefile	8 Aug 2003 15:08:50 -0000	4.36.2.2
--- Makefile	21 Aug 2003 20:24:15 -0000	4.36.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: _timer.c
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/_timer.c,v
retrieving revision 4.42.2.2
retrieving revision 4.42.2.3
diff -C2 -d -r4.42.2.2 -r4.42.2.3
*** _timer.c	18 Aug 2003 23:19:52 -0000	4.42.2.2
--- _timer.c	21 Aug 2003 20:24:15 -0000	4.42.2.3
***************
*** 104,107 ****
--- 104,111 ----
  double etime_disable_time = 0.0;
  
+ #ifndef TWO_TO_THIRTYTWO
+ #define TWO_TO_THIRTYTWO  (4294967296.00)
+ #endif
+ 
  /* number of seconds from some epoch, to clock tick resolution */
  double
***************
*** 145,148 ****
--- 149,172 ----
  
  
+ #if !defined(ETIME_RETURNED) && defined(HAVE_QUERYPERFORMANCECOUNTER) && defined(WIN32)
+   BOOL frequency_ok = 0;
+   BOOL counter_ok = 0;
+   LARGE_INTEGER frequency;
+   LARGE_INTEGER counter;
+   double dfreq;
+   double dcount;
+   frequency_ok = QueryPerformanceFrequency (&frequency);
+   counter_ok = QueryPerformanceCounter (&counter);
+   if (frequency_ok && counter_ok)
+     {
+       dfreq = frequency.HighPart * TWO_TO_THIRTYTWO + frequency.LowPart;
+       dcount = counter.HighPart * TWO_TO_THIRTYTWO + counter.LowPart;
+       if (dfreq > 0.0 && dcount > 0.0)
+ 	{
+ 	  return (dcount / dfreq);
+ 	}
+     }
+ #define ETIME_RETURNED
+ #endif
  
  #else /* HAVE_CONFIG_H  */
***************
*** 281,285 ****
    double dfreq;
    double dcount;
- #define TWO_TO_THIRTYTWO  (4294967296.00)
  #endif
  
--- 305,308 ----
***************
*** 416,419 ****
--- 439,450 ----
        usleep (useconds);
      }
+   return;
+ #define ESLEEP_RETURNED
+ #endif
+ 
+ #if !defined(ESLEEP_RETURNED) && defined(WIN32) && defined(HAVE_SLEEPEX)
+   if (seconds_to_sleep <= 0.0)
+     return;
+   SleepEx (((unsigned long) (seconds_to_sleep * 1000)), FALSE);
    return;
  #define ESLEEP_RETURNED

Index: shm.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/shm.cc,v
retrieving revision 4.35
retrieving revision 4.35.2.1
diff -C2 -d -r4.35 -r4.35.2.1
*** shm.cc	6 May 2003 15:18:21 -0000	4.35
--- shm.cc	21 Aug 2003 20:24:15 -0000	4.35.2.1
***************
*** 42,46 ****
      {
        /* create shared memory */
! #if defined(VXWORKS) || defined(_Windows)
        shm = rcs_shm_open (key, size, 1);
  #else
--- 42,46 ----
      {
        /* create shared memory */
! #if defined(VXWORKS) || defined(_Windows) || defined(WIN32)
        shm = rcs_shm_open (key, size, 1);
  #else

[Emc-commit] rcslib/src/posemath Makefile,4.41.2.1,4.41.2.2

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

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

Modified Files:
      Tag: wps_multiplat_dev_branch
	Makefile 
Log Message:
.

Index: Makefile
===================================================================
RCS file: /cvsroot/emc/rcslib/src/posemath/Makefile,v
retrieving revision 4.41.2.1
retrieving revision 4.41.2.2
diff -C2 -d -r4.41.2.1 -r4.41.2.2
*** Makefile	8 Aug 2003 14:21:14 -0000	4.41.2.1
--- Makefile	21 Aug 2003 20:24:15 -0000	4.41.2.2
***************
*** 1,3 ****
--- 1,18 ----
  
+ 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
  
  ifndef RCSLIB_MAIN_DIR
***************
*** 257,258 ****
--- 272,276 ----
  
  endif
+ 
+ endif
+ # ifndef USE_OLD_RCSLIB_MAKEFILES

[Emc-commit] rtapi/src/rtapi rtapi.h,1.26,1.27 rtapi_proc.h,1.1,1.2

[<pa...@us...>]

Update of /cvsroot/emc/rtapi/src/rtapi
In directory sc8-pr-cvs1:/tmp/cvs-serv5240

Modified Files:
	rtapi.h rtapi_proc.h 
Log Message:
Sorry John, but I believe the proc_fs macros to be important enough to go in the main rtapi header

Index: rtapi.h
===================================================================
RCS file: /cvsroot/emc/rtapi/src/rtapi/rtapi.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** rtapi.h	20 Aug 2003 03:16:21 -0000	1.26
--- rtapi.h	20 Aug 2003 19:46:38 -0000	1.27
***************
*** 485,487 ****
--- 485,547 ----
  extern unsigned char rtapi_inb(unsigned int port);
  
+ /***********************************************************************
+ *                        PROC_FS MACROS                                *
+ ************************************************************************/
+ #ifdef CONFIG_PROC_FS
+ /* Before using these macros, you MUST include linux/proc_fs.h
+    pior to rtapi.h */
+ 
+ /* proc print macros - Contributed by: Erwin Rol (er...@mu...)
+    and shamelessly ripped from rtai_proc_fs.h, part of the RTAI
+    project.  See http://www.rtai.org for more details.
+ 
+    macro that holds the local variables that
+    we use in the PROC_PRINT_* macros. We have
+    this macro so we can add variables with out
+    changing the users of this macro, of course
+    only when the names don't colide!
+ */
+ 
+ #define PROC_PRINT_VARS                                 \
+     off_t pos = 0;                                      \
+     off_t begin = 0;                                    \
+     int len = 0			/* no ";" */
+ 
+ /* macro that prints in the procfs read buffer.
+    this macro expects the function arguments to be
+    named as follows.
+    static int FOO(char *page, char **start,
+                 off_t off, int count, int *eof, void *data)  */
+ 
+ #define PROC_PRINT(fmt,args...)                         \
+     len += sprintf(page + len , fmt, ##args);           \
+     pos += len;                                         \
+     if(pos < off) {                                     \
+         len = 0;                                        \
+         begin = pos;                                    \
+     }                                                   \
+     if(pos > off + count)                               \
+         goto done;
+ 
+ /* macro to leave the read function from another
+    place than at the end.   */
+ #define PROC_PRINT_RETURN                              \
+     *eof = 1;                                          \
+     goto done			// no ";"
+ 
+ /* macro that should only used once at the end of the
+    read function, to return from another place in the
+    read function use the PROC_PRINT_RETURN macro.   */
+ #define PROC_PRINT_DONE                                 \
+         *eof = 1;                                       \
+     done:                                               \
+         *start = page + (off - begin);                  \
+         len -= (off - begin);                           \
+         if(len > count)                                 \
+             len = count;                                \
+         if(len < 0)                                     \
+             len = 0;                                    \
+         return len		// no ";"
+ 
+ 
  #endif /* RTAPI_H */

Index: rtapi_proc.h
===================================================================
RCS file: /cvsroot/emc/rtapi/src/rtapi/rtapi_proc.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rtapi_proc.h	20 Aug 2003 03:16:21 -0000	1.1
--- rtapi_proc.h	20 Aug 2003 19:46:38 -0000	1.2
***************
*** 56,120 ****
  #include <linux/proc_fs.h>
  
- #ifdef CONFIG_PROC_FS
- 
- /* proc print macros - Contributed by: Erwin Rol (er...@mu...)
-    and shamelessly ripped from rtai_proc_fs.h, part of the RTAI
-    project.  See http://www.rtai.org for more details.
- 
-    macro that holds the local variables that
-    we use in the PROC_PRINT_* macros. We have
-    this macro so we can add variables with out
-    changing the users of this macro, of course
-    only when the names don't colide!
- */
- 
- #define PROC_PRINT_VARS                                 \
-     off_t pos = 0;                                      \
-     off_t begin = 0;                                    \
-     int len = 0			/* no ";" */
- 
- /* macro that prints in the procfs read buffer.
-    this macro expects the function arguments to be
-    named as follows.
-    static int FOO(char *page, char **start,
-                 off_t off, int count, int *eof, void *data)  */
- 
- #define PROC_PRINT(fmt,args...)                         \
-     len += sprintf(page + len , fmt, ##args);           \
-     pos += len;                                         \
-     if(pos < off) {                                     \
-         len = 0;                                        \
-         begin = pos;                                    \
-     }                                                   \
-     if(pos > off + count)                               \
-         goto done;
- 
- /* macro to leave the read function from another
-    place than at the end.   */
- #define PROC_PRINT_RETURN                              \
-     *eof = 1;                                          \
-     goto done			// no ";"
- 
- /* macro that should only used once at the end of the
-    read function, to return from another place in the
-    read function use the PROC_PRINT_RETURN macro.   */
- #define PROC_PRINT_DONE                                 \
-         *eof = 1;                                       \
-     done:                                               \
-         *start = page + (off - begin);                  \
-         len -= (off - begin);                           \
-         if(len > count)                                 \
-             len = count;                                \
-         if(len < 0)                                     \
-             len = 0;                                    \
-         return len		// no ";"
- 
- 
  /* Internal function for the proc_fs system. */
  
! /* FIXME - according to my book, this interface is only available
! for 2.4 kernels.  I'm afraid this code will break on 2.0 or 2.2
! The current implimentation may well break on a 2.2 series kernel,
! but the process is the same...
  */
  
--- 56,66 ----
  #include <linux/proc_fs.h>
  
  /* Internal function for the proc_fs system. */
  
! /* The proc file system is available in 2.2 and 2.4 kernels with 
!   minor differences - The 2.4 kernels have a usefull helper function
!   for creating the proc_fs entries.
!   It is unlikely that the following implimentaion will work on a 2.0
!   series kernel..
  */
  
***************
*** 339,343 ****
      return -1;
    }
! //  rtapi_dir->owner = THIS_MODULE;
    /* create read only file "/proc/rtapi/status" */
    status_file = create_proc_entry("status", S_IRUGO, rtapi_dir);
--- 285,289 ----
      return -1;
    }
! 
    /* create read only file "/proc/rtapi/status" */
    status_file = create_proc_entry("status", S_IRUGO, rtapi_dir);
***************
*** 346,349 ****
--- 292,296 ----
    }
    status_file->read_proc = proc_read_status;
+ 
    /* create read only file "/proc/rtapi/tasks" */
    tasks_file = create_proc_entry("tasks", S_IRUGO, rtapi_dir);
***************
*** 352,355 ****
--- 299,303 ----
    }
    tasks_file->read_proc = proc_read_tasks;
+ 
    /* create read only file "/proc/rtapi/shmem" */
    shmem_file = create_proc_entry("shmem", S_IRUGO, rtapi_dir);
***************
*** 358,361 ****
--- 306,310 ----
    }
    shmem_file->read_proc = proc_read_shmem;
+ 
    /* create read only file "/proc/rtapi/sems" */
    sems_file = create_proc_entry("sems", S_IRUGO, rtapi_dir);
***************
*** 364,367 ****
--- 313,317 ----
    }
    sems_file->read_proc = proc_read_sems;
+ 
    /* create read only file "/proc/rtapi/fifos" */
    fifos_file = create_proc_entry("fifos", S_IRUGO, rtapi_dir);
***************
*** 370,373 ****
--- 320,324 ----
    }
    fifos_file->read_proc = proc_read_fifos;
+ 
    /* create read/write file "/proc/rtapi/debug" */
    debug_file = create_proc_entry("debug", S_IRUGO | S_IWUGO, rtapi_dir);
***************
*** 375,379 ****
      return -1;
    }
- //  debug_file->owner = THIS_MODULE;
    debug_file->data = NULL;
    debug_file->read_proc = proc_read_debug;
--- 326,329 ----

[Emc-commit] rcslib/src/stg_clss Makefile,4.33.2.2,4.33.2.3

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

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

Modified Files:
      Tag: wps_multiplat_dev_branch
	Makefile 
Log Message:
.

Index: Makefile
===================================================================
RCS file: /cvsroot/emc/rcslib/src/stg_clss/Makefile,v
retrieving revision 4.33.2.2
retrieving revision 4.33.2.3
diff -C2 -d -r4.33.2.2 -r4.33.2.3
*** Makefile	8 Aug 2003 15:08:50 -0000	4.33.2.2
--- Makefile	21 Aug 2003 20:24:15 -0000	4.33.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

[Emc-commit] rcslib/src/print Makefile,4.33.2.2,4.33.2.3 rcs_prnt.cc,4.43.2.2,4.43.2.3 rcs_prnt.hh,4.38.2.1,4.38.2.2

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

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

Modified Files:
      Tag: wps_multiplat_dev_branch
	Makefile rcs_prnt.cc rcs_prnt.hh 
Log Message:
.

Index: Makefile
===================================================================
RCS file: /cvsroot/emc/rcslib/src/print/Makefile,v
retrieving revision 4.33.2.2
retrieving revision 4.33.2.3
diff -C2 -d -r4.33.2.2 -r4.33.2.3
*** Makefile	8 Aug 2003 15:08:50 -0000	4.33.2.2
--- Makefile	21 Aug 2003 20:24:15 -0000	4.33.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_prnt.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/print/rcs_prnt.cc,v
retrieving revision 4.43.2.2
retrieving revision 4.43.2.3
diff -C2 -d -r4.43.2.2 -r4.43.2.3
*** rcs_prnt.cc	18 Aug 2003 23:19:52 -0000	4.43.2.2
--- rcs_prnt.cc	21 Aug 2003 20:24:15 -0000	4.43.2.3
***************
*** 1,56 ****
- #include "rcs_defs.hh"		/* _Windows, RCS_FAR, EXTERN_C_STD_HEADERS */
- 
- #ifdef DEBUG_MEMORY
- #include "dbg_mem.h"		// DEBUG_MALLOC, DEBUG_FREE
- #else
- #define DEBUG_MALLOC(x) malloc(x)
- #define DEBUG_FREE(x) free(x)
- #endif
- 
- #ifdef EXTERN_C_STD_HEADERS
- extern "C"
- {
- #endif
- 
- #ifdef VXWORKS
- #include "vxWorks.h"
- #endif
- 
- 
- #ifdef USING_VARARGS
- #include <varargs.h>		/* va_list, va_start(), va_end() */
- #else
- #include <stdarg.h>		/* va_list, va_start(), va_end() */
- #endif
- 
- #ifndef NO_STDIO
- #include <stdio.h>		/* __printf()'s */
- #endif
- 
- #include <string.h>		/* strchr(), memmove() */
- #include <stdlib.h>		/* malloc(), free(), realloc() */
- #include <errno.h>		// errno()
- #ifdef VXWORKS
- #include <logLib.h>		/* logMsg() */
- #endif
  
  
- #ifdef VXWORKS
- #include <taskLib.h>		/* taskIdSelf() */
  #else
! #include <sys/types.h>
! #ifdef UNIX_LIKE_PLAT
! #include <unistd.h>		/* getpid() */
! #endif
! #endif
! 
! #include <ctype.h>
! 
! #ifdef EXTERN_C_STD_HEADERS
! }
! #endif
! 
! #ifdef _Windows
! #include <windows.h>		/* MessageBox() */
  #endif
  
--- 1,8 ----
  
+ #if HAVE_CONFIG_H
+ #include "rcs_config_include.h"
  
  #else
! #include "rcs_prnt_no_config.h"
  #endif
  
***************
*** 65,69 ****
--- 17,24 ----
  RCS_LINKED_LIST RCS_FAR *rcs_print_list = NULL;
  char RCS_FAR **rcs_lines_table = NULL;
+ #if 0
  void (RCS_PASCAL RCS_FAR * rcs_print_notify) () = NULL;
+ #endif
+ 
  #if !defined(_Windows) || defined(WIN32)
  RCS_PRINT_DESTINATION_TYPE rcs_print_destination = RCS_PRINT_TO_STDOUT;
***************
*** 159,162 ****
--- 114,120 ----
      }
  }
+ 
+ #if 0
+ 
  void RCS_EXPORT
  set_rcs_print_notify (RCS_PRINT_NOTIFY_FUNC_PTR _rcs_print_notify)
***************
*** 164,167 ****
--- 122,126 ----
    rcs_print_notify = _rcs_print_notify;
  }
+ #endif
  
  void RCS_EXPORT
***************
*** 614,621 ****
--- 573,582 ----
  	  break;
  	}
+ #if 0
        if (NULL != rcs_print_notify)
  	{
  	  (*rcs_print_notify) ();
  	}
+ #endif
      }
    return (retval);

Index: rcs_prnt.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/print/rcs_prnt.hh,v
retrieving revision 4.38.2.1
retrieving revision 4.38.2.2
diff -C2 -d -r4.38.2.1 -r4.38.2.2
*** rcs_prnt.hh	8 Aug 2003 14:21:14 -0000	4.38.2.1
--- rcs_prnt.hh	21 Aug 2003 20:24:15 -0000	4.38.2.2
***************
*** 14,53 ****
  #define set_rcs_print_file(x)
  
- #ifdef EXTERN_C_STD_HEADERS
  extern "C"
  {
- #endif
- 
  extern int separate_words (char ** _dest, int _max,
  					char * _src);
- 
- #if defined(__CPLUSPLUS__) || defined(__cplusplus)
  }
- #endif
  
  #else
! 
! #include "rcs_defs.hh"		/* _Windows, RCS_FAR, EXTERN_C_STD_HEADERS */
! 
! #ifdef EXTERN_C_STD_HEADERS
! extern "C"
! {
! #endif
! 
! #ifdef VXWORKS
! #include "vxWorks.h"
! #endif
! 
! 
! #ifdef USING_VARARGS
! #include <varargs.h>		/* va_list */
! #else
! #include <stdarg.h>		/* va_list */
! #endif
! 
! #ifdef EXTERN_C_STD_HEADERS
! }
! #endif
! 
  
  #if defined(__CPLUSPLUS__) || defined(__cplusplus)
--- 14,25 ----
  #define set_rcs_print_file(x)
  
  extern "C"
  {
  extern int separate_words (char ** _dest, int _max,
  					char * _src);
  }
  
  #else
! // ifdef DISABLE_RCS_PRINT
  
  #if defined(__CPLUSPLUS__) || defined(__cplusplus)
***************
*** 55,63 ****
  
  #ifdef USING_DECLSPEC
! extern RCS_EXPORT RCS_LINKED_LIST RCS_FAR *get_rcs_print_list ();
  #else
! extern RCS_LINKED_LIST RCS_FAR *RCS_EXPORT get_rcs_print_list ();
  #endif
! extern void RCS_EXPORT set_rcs_print_list_sizing_mode (int, LIST_SIZING_MODE);
  #endif
  
--- 27,35 ----
  
  #ifdef USING_DECLSPEC
! extern  RCS_LINKED_LIST *get_rcs_print_list ();
  #else
! extern RCS_LINKED_LIST * get_rcs_print_list ();
  #endif
! extern void  set_rcs_print_list_sizing_mode (int, LIST_SIZING_MODE);
  #endif
  
***************
*** 67,94 ****
  #endif
  
!   extern void RCS_EXPORT clean_print_list (void);
!   extern void RCS_EXPORT output_print_list (int output_func (char *));
!   extern int RCS_EXPORT count_characters_in_print_list (void);
!   extern int RCS_EXPORT count_lines_in_print_list (void);
!   extern void RCS_EXPORT convert_print_list_to_lines (void);
!   extern void RCS_EXPORT update_lines_table (void);
!   extern int RCS_EXPORT rcs_vprint (char RCS_FAR * _fmt, va_list va_args,
  				    int save_string);
!   extern int RCS_EXPORT rcs_print (char RCS_FAR * _fmt, ...);
!   extern int RCS_EXPORT rcs_print_debug (long, char RCS_FAR * _fmt, ...);
  #ifdef DO_NOT_USE_RCS_PRINT_ERROR_NEW
!   extern int RCS_EXPORT rcs_print_error (char RCS_FAR * _fmt, ...);
  #else
!   extern int RCS_EXPORT set_print_rcs_error_info (const char *file, int line);
!   extern int RCS_EXPORT print_rcs_error_new (char RCS_FAR * _fmt, ...);
  #define rcs_print_error set_print_rcs_error_info( __FILE__, __LINE__); print_rcs_error_new
  #endif
  
  #ifdef DO_NOT_USE_RCS_PRINT_DEBUG_NEW
!   extern int RCS_EXPORT rcs_print_debug (char RCS_FAR * _fmt, ...);
  #else
!   extern int RCS_EXPORT set_print_rcs_debug_info (const char *file, int line);
!   extern int RCS_EXPORT print_rcs_debug_new (long flags_to_check,
! 					     char RCS_FAR * _fmt, ...);
    extern unsigned long rcs_print_mode_flags;
    extern int rcs_debugging_enabled;
--- 39,68 ----
  #endif
  
!   extern void  clean_print_list (void);
!   extern void  output_print_list (int output_func (char *));
!   extern int  count_characters_in_print_list (void);
!   extern int  count_lines_in_print_list (void);
!   extern void  convert_print_list_to_lines (void);
!   extern void  update_lines_table (void);
! #if 0
!   extern int  rcs_vprint (char * _fmt, va_list va_args,
  				    int save_string);
! #endif
!   extern int  rcs_print (char * _fmt, ...);
!   extern int  rcs_print_debug (long, char * _fmt, ...);
  #ifdef DO_NOT_USE_RCS_PRINT_ERROR_NEW
!   extern int  rcs_print_error (char * _fmt, ...);
  #else
!   extern int  set_print_rcs_error_info (const char *file, int line);
!   extern int  print_rcs_error_new (char * _fmt, ...);
  #define rcs_print_error set_print_rcs_error_info( __FILE__, __LINE__); print_rcs_error_new
  #endif
  
  #ifdef DO_NOT_USE_RCS_PRINT_DEBUG_NEW
!   extern int  rcs_print_debug (char * _fmt, ...);
  #else
!   extern int  set_print_rcs_debug_info (const char *file, int line);
!   extern int  print_rcs_debug_new (long flags_to_check,
! 					     char * _fmt, ...);
    extern unsigned long rcs_print_mode_flags;
    extern int rcs_debugging_enabled;
***************
*** 98,133 ****
  
  
!   extern void RCS_EXPORT set_rcs_print_flag (unsigned long flags_to_set);
!   extern void RCS_EXPORT clear_rcs_print_flag (unsigned long flags_to_set);
  
  #ifdef USING_DECLSPEC
!   extern RCS_EXPORT char RCS_FAR *strip_control_characters (char RCS_FAR *
  							    _dest,
! 							    char RCS_FAR *
  							    _src);
  #else
!   extern char RCS_FAR *RCS_EXPORT strip_control_characters (char RCS_FAR *
  							    _dest,
! 							    char RCS_FAR *
  							    _src);
  #endif
  
!   extern int RCS_EXPORT separate_words (char RCS_FAR ** _dest, int _max,
! 					char RCS_FAR * _src);
  
!   extern int RCS_EXPORT rcs_puts (char RCS_FAR *);
!   extern int RCS_EXPORT rcs_fputs (char RCS_FAR *);
  
  #ifdef USING_DECLSPEC
!   extern RCS_EXPORT char RCS_FAR **get_rcs_lines_table (void);
  #else
!   extern char RCS_FAR **RCS_EXPORT get_rcs_lines_table (void);
  #endif
!   extern int RCS_EXPORT get_rcs_print_list_size (void);
  
!   typedef void (RCS_PASCAL RCS_FAR * RCS_PRINT_NOTIFY_FUNC_PTR) (void);
!   extern void RCS_EXPORT set_rcs_print_notify (RCS_PRINT_NOTIFY_FUNC_PTR);
!   extern int RCS_EXPORT set_rcs_print_file (char RCS_FAR * _file_name);
!   extern void RCS_EXPORT close_rcs_printing (void);
  
  #if defined(__CPLUSPLUS__) || defined(__cplusplus)
--- 72,109 ----
  
  
!   extern void  set_rcs_print_flag (unsigned long flags_to_set);
!   extern void  clear_rcs_print_flag (unsigned long flags_to_set);
  
  #ifdef USING_DECLSPEC
!   extern  char *strip_control_characters (char *
  							    _dest,
! 							    char *
  							    _src);
  #else
!   extern char * strip_control_characters (char *
  							    _dest,
! 							    char *
  							    _src);
  #endif
  
!   extern int  separate_words (char ** _dest, int _max,
! 					char * _src);
  
!   extern int  rcs_puts (char *);
!   extern int  rcs_fputs (char *);
  
  #ifdef USING_DECLSPEC
!   extern  char **get_rcs_lines_table (void);
  #else
!   extern char ** get_rcs_lines_table (void);
  #endif
!   extern int  get_rcs_print_list_size (void);
  
! #if 0
!   typedef void (RCS_PASCAL * RCS_PRINT_NOTIFY_FUNC_PTR) (void);
!   extern void  set_rcs_print_notify (RCS_PRINT_NOTIFY_FUNC_PTR);
! #endif
!   extern int  set_rcs_print_file (char * _file_name);
!   extern void  close_rcs_printing (void);
  
  #if defined(__CPLUSPLUS__) || defined(__cplusplus)
***************
*** 200,210 ****
  #endif
  
!   extern void RCS_EXPORT
      set_rcs_print_destination (RCS_PRINT_DESTINATION_TYPE);
!   extern RCS_PRINT_DESTINATION_TYPE RCS_EXPORT
      get_rcs_print_destination (void);
  
!   extern int RCS_EXPORT rcs_print_sys_error (int error_source,
! 					     char RCS_FAR * _fmt, ...);
  
  #if defined(__CPLUSPLUS__) || defined(__cplusplus)
--- 176,186 ----
  #endif
  
!   extern void 
      set_rcs_print_destination (RCS_PRINT_DESTINATION_TYPE);
!   extern RCS_PRINT_DESTINATION_TYPE 
      get_rcs_print_destination (void);
  
!   extern int  rcs_print_sys_error (int error_source,
! 					     char * _fmt, ...);
  
  #if defined(__CPLUSPLUS__) || defined(__cplusplus)

[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>

[Emc-commit] rcslib/src/node Makefile,4.32.2.2,4.32.2.3

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

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

Modified Files:
      Tag: wps_multiplat_dev_branch
	Makefile 
Log Message:
.

Index: Makefile
===================================================================
RCS file: /cvsroot/emc/rcslib/src/node/Makefile,v
retrieving revision 4.32.2.2
retrieving revision 4.32.2.3
diff -C2 -d -r4.32.2.2 -r4.32.2.3
*** Makefile	8 Aug 2003 15:08:49 -0000	4.32.2.2
--- Makefile	21 Aug 2003 20:24:14 -0000	4.32.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

[Emc-commit] rcslib Makefile.am,1.7.2.7,1.7.2.8 Makefile.in,1.7.2.7,1.7.2.8 configure,1.3.2.4,1.3.2.5 configure.ac,1.3.2.3,1.3.2.4 rcs_config.h.in,1.1.2.4,1.1.2.5

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

Update of /cvsroot/emc/rcslib
In directory sc8-pr-cvs1:/tmp/cvs-serv13430

Modified Files:
      Tag: wps_multiplat_dev_branch
	Makefile.am Makefile.in configure configure.ac rcs_config.h.in 
Log Message:
.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/emc/rcslib/Makefile.am,v
retrieving revision 1.7.2.7
retrieving revision 1.7.2.8
diff -C2 -d -r1.7.2.7 -r1.7.2.8
*** Makefile.am	21 Aug 2003 20:24:13 -0000	1.7.2.7
--- Makefile.am	22 Aug 2003 03:34:26 -0000	1.7.2.8
***************
*** 131,134 ****
--- 131,136 ----
  	src/os_intf/_shm.c \
  	src/os_intf/unix_sem.c \
+ 	src/os_intf/vxworks_sem.c \
+ 	src/os_intf/win32_sem.c \
  	src/cms/memsem.cc\
  	src/cms/shmem.cc \

Index: Makefile.in
===================================================================
RCS file: /cvsroot/emc/rcslib/Makefile.in,v
retrieving revision 1.7.2.7
retrieving revision 1.7.2.8
diff -C2 -d -r1.7.2.7 -r1.7.2.8
*** Makefile.in	21 Aug 2003 20:24:13 -0000	1.7.2.7
--- Makefile.in	22 Aug 2003 03:34:26 -0000	1.7.2.8
***************
*** 224,227 ****
--- 224,229 ----
  	src/os_intf/_shm.c \
  	src/os_intf/unix_sem.c \
+ 	src/os_intf/vxworks_sem.c \
+ 	src/os_intf/win32_sem.c \
  	src/cms/memsem.cc\
  	src/cms/shmem.cc \
***************
*** 1112,1119 ****
  @AMDEP_TRUE@	./$(DEPDIR)/udp_opts.Plo ./$(DEPDIR)/udp_srv.Plo \
  @AMDEP_TRUE@	./$(DEPDIR)/udpmem.Plo ./$(DEPDIR)/unix_sem.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/xdr.Plo ./$(DEPDIR)/xdr_arra.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/xdr_floa.Plo ./$(DEPDIR)/xdr_mem.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/xdr_msg.Plo ./$(DEPDIR)/xdr_rec.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/xdr_refe.Plo ./$(DEPDIR)/xdr_stdi.Plo \
  @AMDEP_TRUE@	./$(DEPDIR)/xsd2nmlh-_timer.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/xsd2nmlh-cms_xml_up.Po \
--- 1114,1123 ----
  @AMDEP_TRUE@	./$(DEPDIR)/udp_opts.Plo ./$(DEPDIR)/udp_srv.Plo \
  @AMDEP_TRUE@	./$(DEPDIR)/udpmem.Plo ./$(DEPDIR)/unix_sem.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/vxworks_sem.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/win32_sem.Plo ./$(DEPDIR)/xdr.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/xdr_arra.Plo ./$(DEPDIR)/xdr_floa.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/xdr_mem.Plo ./$(DEPDIR)/xdr_msg.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/xdr_rec.Plo ./$(DEPDIR)/xdr_refe.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/xdr_stdi.Plo \
  @AMDEP_TRUE@	./$(DEPDIR)/xsd2nmlh-_timer.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/xsd2nmlh-cms_xml_up.Po \
***************
*** 1411,1414 ****
--- 1415,1420 ----
  _shm.lo: src/os_intf/_shm.c
  unix_sem.lo: src/os_intf/unix_sem.c
+ vxworks_sem.lo: src/os_intf/vxworks_sem.c
+ win32_sem.lo: src/os_intf/win32_sem.c
  memsem.lo: src/cms/memsem.cc
  shmem.lo: src/cms/shmem.cc
***************
*** 2107,2110 ****
--- 2113,2118 ----
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/udpmem.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unix_sem.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vxworks_sem.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32_sem.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdr.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdr_arra.Plo@am__quote@
***************
*** 2536,2539 ****
--- 2544,2583 ----
  @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unix_sem.lo `test -f 'src/os_intf/unix_sem.c' || echo '$(srcdir)/'`src/os_intf/unix_sem.c
+ 
+ vxworks_sem.o: src/os_intf/vxworks_sem.c
+ @AMDEP_TRUE@	source='src/os_intf/vxworks_sem.c' object='vxworks_sem.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/vxworks_sem.Po' tmpdepfile='$(DEPDIR)/vxworks_sem.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o vxworks_sem.o `test -f 'src/os_intf/vxworks_sem.c' || echo '$(srcdir)/'`src/os_intf/vxworks_sem.c
+ 
+ vxworks_sem.obj: src/os_intf/vxworks_sem.c
+ @AMDEP_TRUE@	source='src/os_intf/vxworks_sem.c' object='vxworks_sem.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/vxworks_sem.Po' tmpdepfile='$(DEPDIR)/vxworks_sem.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o vxworks_sem.obj `cygpath -w src/os_intf/vxworks_sem.c`
+ 
+ vxworks_sem.lo: src/os_intf/vxworks_sem.c
+ @AMDEP_TRUE@	source='src/os_intf/vxworks_sem.c' object='vxworks_sem.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/vxworks_sem.Plo' tmpdepfile='$(DEPDIR)/vxworks_sem.TPlo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o vxworks_sem.lo `test -f 'src/os_intf/vxworks_sem.c' || echo '$(srcdir)/'`src/os_intf/vxworks_sem.c
+ 
+ win32_sem.o: src/os_intf/win32_sem.c
+ @AMDEP_TRUE@	source='src/os_intf/win32_sem.c' object='win32_sem.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/win32_sem.Po' tmpdepfile='$(DEPDIR)/win32_sem.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o win32_sem.o `test -f 'src/os_intf/win32_sem.c' || echo '$(srcdir)/'`src/os_intf/win32_sem.c
+ 
+ win32_sem.obj: src/os_intf/win32_sem.c
+ @AMDEP_TRUE@	source='src/os_intf/win32_sem.c' object='win32_sem.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/win32_sem.Po' tmpdepfile='$(DEPDIR)/win32_sem.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o win32_sem.obj `cygpath -w src/os_intf/win32_sem.c`
+ 
+ win32_sem.lo: src/os_intf/win32_sem.c
+ @AMDEP_TRUE@	source='src/os_intf/win32_sem.c' object='win32_sem.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/win32_sem.Plo' tmpdepfile='$(DEPDIR)/win32_sem.TPlo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o win32_sem.lo `test -f 'src/os_intf/win32_sem.c' || echo '$(srcdir)/'`src/os_intf/win32_sem.c
  
  sendn.o: src/cms/sendn.c

Index: configure
===================================================================
RCS file: /cvsroot/emc/rcslib/configure,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -C2 -d -r1.3.2.4 -r1.3.2.5
*** configure	21 Aug 2003 20:24:13 -0000	1.3.2.4
--- configure	22 Aug 2003 03:34:26 -0000	1.3.2.5
***************
*** 1074,1080 ****
                            (default=no)
    --with-librt            Check for librt and use if found. (default=yes)
!   --with-libpthread       Check for libpthread and use if found. (default=yes)
!   --with-posix_threads    Check for POSIX threads and use if found. (You may
!                           need to seperately enable libpthread.) (default=yes)
    --with-gnu-ld           assume the C compiler uses GNU ld default=no
    --with-pic              try to use only PIC/non-PIC objects default=use both
--- 1074,1079 ----
                            (default=no)
    --with-librt            Check for librt and use if found. (default=yes)
!   --with-posix_threads    Check for POSIX threads and use if found.
!                           (default=yes)
    --with-gnu-ld           assume the C compiler uses GNU ld default=no
    --with-pic              try to use only PIC/non-PIC objects default=use both
***************
*** 1866,1870 ****
  echo "$as_me: PLEASE READ THE INSTALL FILE" >&6;}
  
! CONFIGURED_PROGRAMS="nmltest nmlcfg nmlclean";
  CONFIGURED_STATIC_LIBRARIES=""
  CONFIGURED_SUBDIRS=
--- 1865,1869 ----
  echo "$as_me: PLEASE READ THE INSTALL FILE" >&6;}
  
! CONFIGURED_PROGRAMS='nmltest$(EXEEXT) nmlcfg$(EXEEXT) nmlclean$(EXEEXT)'
  CONFIGURED_STATIC_LIBRARIES=""
  CONFIGURED_SUBDIRS=
***************
*** 1924,1940 ****
  
  
- # Check whether --with-libpthread or --without-libpthread was given.
- if test "${with_libpthread+set}" = set; then
-   withval="$with_libpthread"
-   with_libpthread=$withval;
- 	{ echo "$as_me:$LINENO: with_libpthread=${with_libpthread}" >&5
- echo "$as_me: with_libpthread=${with_libpthread}" >&6;}
- else
-   with_libpthread=no
- 
- fi;
- 
- 
- 
  # Check whether --with-posix_threads or --without-posix_threads was given.
  if test "${with_posix_threads+set}" = set; then
--- 1923,1926 ----
***************
*** 2254,2269 ****
  
  if test "x${enable_xsd2nmlh}" = "xyes" ; then
!    CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} xsd2nmlh"
!    { echo "$as_me:$LINENO: CONFIGURED_PROGRAMS=${CONFIGURED_PROGRAMS}" >&5
! echo "$as_me: CONFIGURED_PROGRAMS=${CONFIGURED_PROGRAMS}" >&6;}
  fi
  
  if test "x${enable_filemem}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} filemem.lo"
!    { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_FILEMEM"
!    { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
  
  fi
--- 2240,2252 ----
  
  if test "x${enable_xsd2nmlh}" = "xyes" ; then
!    CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} 'xsd2nmlh$(EXEEXT)'"
!    ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS=${CONFIGURED_PROGRAMS}])
  fi
  
  if test "x${enable_filemem}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} filemem.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_FILEMEM"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  
  fi
***************
*** 2271,2279 ****
  if test "x${enable_shmem}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} shmem.lo _shm.lo shm.lo sem.lo memsem.lo autokey.lo"
!    { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_SHMEM"
!    { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
  
  fi
--- 2254,2260 ----
  if test "x${enable_shmem}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} shmem.lo _shm.lo shm.lo sem.lo memsem.lo autokey.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_SHMEM"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  
  fi
***************
*** 2283,2288 ****
  if test "x${enable_posemath_in_rcslib}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} _posemath.lo mathprnt.lo sincos.lo posemath.lo"
!    { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
  fi
  
--- 2264,2268 ----
  if test "x${enable_posemath_in_rcslib}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} _posemath.lo mathprnt.lo sincos.lo posemath.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
  fi
  
***************
*** 2290,2295 ****
  if test "x${enable_nmlmod_in_rcslib}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} nml_mod.lo cmd_msg.lo stat_msg.lo nml_oi.lo"
!    { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
  fi
  
--- 2270,2274 ----
  if test "x${enable_nmlmod_in_rcslib}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} nml_mod.lo cmd_msg.lo stat_msg.lo nml_oi.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
  fi
  
***************
*** 2301,2309 ****
     fi
     enable_sokintrf=yes
!    { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_HTTP"
!    { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
     enable_xml=yes;
  fi
--- 2280,2286 ----
     fi
     enable_sokintrf=yes
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_HTTP"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
     enable_xml=yes;
  fi
***************
*** 2311,2328 ****
  if test "x${enable_tty}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} ttymem.lo tty_srv.lo ttyintf.lo"
!    { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_TTY"
!    { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
  fi
  
  if test "x${enable_locmem}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} locmem.lo"
!    { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_LOCMEM"
!    { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
  
  fi
--- 2288,2301 ----
  if test "x${enable_tty}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} ttymem.lo tty_srv.lo ttyintf.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_TTY"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  fi
  
  if test "x${enable_locmem}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} locmem.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_LOCMEM"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  
  fi
***************
*** 2331,2339 ****
  if test "x${enable_phantom}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} phantom.lo"
!    { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_PHANTOM"
!    { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
  
  fi
--- 2304,2310 ----
  if test "x${enable_phantom}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} phantom.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_PHANTOM"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  
  fi
***************
*** 2346,2354 ****
     fi
     enable_sokintrf=yes
!    { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_STCP"
!    { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
  
  fi
--- 2317,2323 ----
     fi
     enable_sokintrf=yes
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_STCP"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  
  fi
***************
*** 2362,2370 ****
     fi
     enable_sokintrf=yes
!    { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_TCP"
!    { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
  #   CONFIGURED_LTLIBRARIES="${CONFIGURED_LTLIBRARIES} libcmstcp.la"
  #   AC_MSG_NOTICE([CONFIGURED_LTLIBRARIES=${CONFIGURED_LTLIBRARIES}])
--- 2331,2337 ----
     fi
     enable_sokintrf=yes
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_TCP"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  #   CONFIGURED_LTLIBRARIES="${CONFIGURED_LTLIBRARIES} libcmstcp.la"
  #   AC_MSG_NOTICE([CONFIGURED_LTLIBRARIES=${CONFIGURED_LTLIBRARIES}])
***************
*** 2379,2387 ****
     fi
     enable_sokintrf=yes
!    { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_UDP"
!    { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
  
  fi
--- 2346,2352 ----
     fi
     enable_sokintrf=yes
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_UDP"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  
  fi
***************
*** 2389,2397 ****
  if test "x${enable_crypt}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} crypt2.lo"
!    { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_CRYPT2"
!    { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
  
  fi
--- 2354,2360 ----
  if test "x${enable_crypt}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} crypt2.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_CRYPT2"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  
  fi
***************
*** 2400,2408 ****
  if test "x${enable_xml}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} cms_xml_up.lo"
!    { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_XML"
!    { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
  
  fi
--- 2363,2369 ----
  if test "x${enable_xml}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} cms_xml_up.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_XML"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  
  fi
***************
*** 2410,2436 ****
  if test "x${enable_xdr}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} cms_xup.lo"
!    { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_XDR"
!    { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
  fi
  
  if test "x${enable_disp}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} cms_dup.lo"
!    { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_DISP"
!    { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
  fi
  
  if test "x${enable_diag}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} cmsdiag.lo nmldiag.lo"
!    { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_DIAG"
!    { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
  
  fi
--- 2371,2391 ----
  if test "x${enable_xdr}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} cms_xup.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_XDR"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  fi
  
  if test "x${enable_disp}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} cms_dup.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_DISP"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  fi
  
  if test "x${enable_diag}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} cmsdiag.lo nmldiag.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_DIAG"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  
  fi
***************
*** 2439,2457 ****
  if test "x${enable_print}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} rcs_prnt.lo"
!    { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
  else
     CPPFLAGS="${CPPFLAGS} -DDISABLE_RCS_PRINT"
!    { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
  fi
  
  if test "x${enable_nmlqr}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} nmlqr.lo"
!    { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_NMLQR"
!    { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
  
  fi
--- 2394,2408 ----
  if test "x${enable_print}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} rcs_prnt.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
  else
     CPPFLAGS="${CPPFLAGS} -DDISABLE_RCS_PRINT"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  fi
  
  if test "x${enable_nmlqr}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} nmlqr.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_NMLQR"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  
  fi
***************
*** 2459,2467 ****
  if test "x${enable_server}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} cms_srv.lo nml_srv.lo cmssvrp.lo"
!    { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
     CPPFLAGS="${CPPFLAGS} -DCMS_SUPPORT_SERVER"
!    { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
     enable_sokintrf=yes
  fi
--- 2410,2416 ----
  if test "x${enable_server}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} cms_srv.lo nml_srv.lo cmssvrp.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_SUPPORT_SERVER"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
     enable_sokintrf=yes
  fi
***************
*** 2469,2493 ****
  if test "x${enable_sokintrf}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} sokintrf.lo"
!    { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_SOKINTRF"
!    { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
  fi
  
  if test "x${enable_diagapplet_jar}" = "xyes" ; then
     CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} diagapplet.jar CodeGen.jar CodeGenCmdLine.jar rcs.jar";
!    { echo "$as_me:$LINENO: CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}" >&5
! echo "$as_me: CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}" >&6;}
  
  elif test "x${enable_codegen_jar}" = "xyes" ; then
     CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} CodeGen.jar CodeGenCmdLine.jar rcs.jar";
!    { echo "$as_me:$LINENO: CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}" >&5
! echo "$as_me: CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}" >&6;}
  
  elif test "x${enable_rcs_jar}" = "xyes" ; then
     CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} rcs.jar";
!    { echo "$as_me:$LINENO: CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}" >&5
! echo "$as_me: CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}" >&6;}
  
  fi
--- 2418,2437 ----
  if test "x${enable_sokintrf}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} sokintrf.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_SOKINTRF"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  fi
  
  if test "x${enable_diagapplet_jar}" = "xyes" ; then
     CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} diagapplet.jar CodeGen.jar CodeGenCmdLine.jar rcs.jar";
!    ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
  
  elif test "x${enable_codegen_jar}" = "xyes" ; then
     CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} CodeGen.jar CodeGenCmdLine.jar rcs.jar";
!    ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
  
  elif test "x${enable_rcs_jar}" = "xyes" ; then
     CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} rcs.jar";
!    ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
  
  fi
***************
*** 5224,5228 ****
  *-*-irix6*)
    # Find out which ABI we are using.
!   echo '#line 5226 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
--- 5168,5172 ----
  *-*-irix6*)
    # Find out which ABI we are using.
!   echo '#line 5170 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
***************
*** 5760,5764 ****
  CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
  compiler_c_o=no
! if { (eval echo configure:5762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
    # The compiler can only warn and ignore the option if not recognized
    # So say no if there are warnings
--- 5704,5708 ----
  CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
  compiler_c_o=no
! if { (eval echo configure:5706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
    # The compiler can only warn and ignore the option if not recognized
    # So say no if there are warnings
***************
*** 7553,7557 ****
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 7555 "configure"
  #include "confdefs.h"
  
--- 7497,7501 ----
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 7499 "configure"
  #include "confdefs.h"
  
***************
*** 7651,7655 ****
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 7653 "configure"
  #include "confdefs.h"
  
--- 7595,7599 ----
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 7597 "configure"
  #include "confdefs.h"
  
***************
*** 8960,8968 ****
         ac_cv_have_xdr_h=yes
         CPPFLAGS="${CPPFLAGS} -I${srcdir}/src/nt_xdr";
!        { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
         LTLIBOBJS="${LTLIBOBJS} bcopy.lo xdr.lo xdr_arra.lo xdr_floa.lo xdr_mem.lo xdr_rec.lo xdr_refe.lo xdr_stdi.lo";
!        { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
      fi
  
--- 8904,8910 ----
         ac_cv_have_xdr_h=yes
         CPPFLAGS="${CPPFLAGS} -I${srcdir}/src/nt_xdr";
!        ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
         LTLIBOBJS="${LTLIBOBJS} bcopy.lo xdr.lo xdr_arra.lo xdr_floa.lo xdr_mem.lo xdr_rec.lo xdr_refe.lo xdr_stdi.lo";
!        ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
      fi
  
***************
*** 9103,9113 ****
  
        GCJFLAGS="${GCJFLAGS} -I${srcdir}/src/java"
!       { echo "$as_me:$LINENO: GCJ : ${GCJ}" >&5
! echo "$as_me: GCJ : ${GCJ}" >&6;}
!       { echo "$as_me:$LINENO: GCJFLAGS : ${GCJFLAGS}" >&5
! echo "$as_me: GCJFLAGS : ${GCJFLAGS}" >&6;}
!       CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} nml_codegen";
!       { echo "$as_me:$LINENO: CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}" >&5
! echo "$as_me: CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}" >&6;}
  
     fi
--- 9045,9052 ----
  
        GCJFLAGS="${GCJFLAGS} -I${srcdir}/src/java"
!       ## AC_MSG_NOTICE([GCJ : ${GCJ}])
!       ## AC_MSG_NOTICE([GCJFLAGS : ${GCJFLAGS}])
!       CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} 'nml_codegen$(EXEEXT)'";
!       ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
  
     fi
***************
*** 9271,9283 ****
  
        CONFIGURED_STATIC_LIBRARIES="${CONFIGURED_STATIC_LIBRARIES} librcsrtl.a";
!       { echo "$as_me:$LINENO: CONFIGURED_STATIC_LIBRARIES : ${CONFIGURED_STATIC_LIBRARIES}" >&5
! echo "$as_me: CONFIGURED_STATIC_LIBRARIES : ${CONFIGURED_STATIC_LIBRARIES}" >&6;};
        if test "x${enable_rtlmem}" = "xyes" ; then
  	 LTLIBOBJS="${LTLIBOBJS} rtlnml.lo	rtlmem.lo rtlinux_user_api_implement.lo"
! 	 { echo "$as_me:$LINENO: LTLIBOBJS=${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS=${LTLIBOBJS}" >&6;}
  	 CPPFLAGS="${CPPFLAGS} -DCMS_USE_RTLMEM"
! 	 { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
        fi
  
--- 9210,9219 ----
  
        CONFIGURED_STATIC_LIBRARIES="${CONFIGURED_STATIC_LIBRARIES} librcsrtl.a";
!       ## AC_MSG_NOTICE([CONFIGURED_STATIC_LIBRARIES : ${CONFIGURED_STATIC_LIBRARIES}]);
        if test "x${enable_rtlmem}" = "xyes" ; then
  	 LTLIBOBJS="${LTLIBOBJS} rtlnml.lo	rtlmem.lo rtlinux_user_api_implement.lo"
! 	 ## AC_MSG_NOTICE([LTLIBOBJS=${LTLIBOBJS}])
  	 CPPFLAGS="${CPPFLAGS} -DCMS_USE_RTLMEM"
! 	 ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
        fi
  
***************
*** 9433,9446 ****
  			if test "x${HAVE_RTAI}" = "xYES" ; then
  				   CONFIGURED_STATIC_LIBRARIES="${CONFIGURED_STATIC_LIBRARIES} librcsrtai.a";
! 				   { echo "$as_me:$LINENO: CONFIGURED_STATIC_LIBRARIES : ${CONFIGURED_STATIC_LIBRARIES}" >&5
! echo "$as_me: CONFIGURED_STATIC_LIBRARIES : ${CONFIGURED_STATIC_LIBRARIES}" >&6;};
  				   if test "x${enable_rtlmem}" = "xyes" ; then
  
  				      LTLIBOBJS="${LTLIBOBJS} rtlnml.lo	rtlmem.lo rtai_user_api_implement.lo"
! 				      { echo "$as_me:$LINENO: LTLIBOBJS=${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS=${LTLIBOBJS}" >&6;}
  				      CPPFLAGS="${CPPFLAGS} -DCMS_USE_RTLMEM"
! 				      { echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
  				   fi
  			fi
--- 9369,9379 ----
  			if test "x${HAVE_RTAI}" = "xYES" ; then
  				   CONFIGURED_STATIC_LIBRARIES="${CONFIGURED_STATIC_LIBRARIES} librcsrtai.a";
! 				   ## AC_MSG_NOTICE([CONFIGURED_STATIC_LIBRARIES : ${CONFIGURED_STATIC_LIBRARIES}]);
  				   if test "x${enable_rtlmem}" = "xyes" ; then
  
  				      LTLIBOBJS="${LTLIBOBJS} rtlnml.lo	rtlmem.lo rtai_user_api_implement.lo"
! 				      ## AC_MSG_NOTICE([LTLIBOBJS=${LTLIBOBJS}])
  				      CPPFLAGS="${CPPFLAGS} -DCMS_USE_RTLMEM"
! 				      ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  				   fi
  			fi
***************
*** 10572,10577 ****
  
  
! 	{ echo "$as_me:$LINENO: ac_cv_have_winsock2=${ac_cv_have_winsock2}" >&5
! echo "$as_me: ac_cv_have_winsock2=${ac_cv_have_winsock2}" >&6;}
  
  	if test "x${ac_cv_have_winsock2}" = "xyes" ; then
--- 10505,10509 ----
  
  
! 	## AC_MSG_NOTICE([ac_cv_have_winsock2=${ac_cv_have_winsock2}])
  
  	if test "x${ac_cv_have_winsock2}" = "xyes" ; then
***************
*** 10581,10585 ****
  _ACEOF
  
! 
  	else
  
--- 10513,10517 ----
  _ACEOF
  
! 	   ## AC_MSG_NOTICE([LIBS=${LIBS}])
  	else
  
***************
*** 10750,10756 ****
  
  
! 	fi
! 
! 	if test "x${ac_cv_have_winsock}" = "xyes" ; then
  
  cat >>confdefs.h <<\_ACEOF
--- 10682,10686 ----
  
  
! 		if test "x${ac_cv_have_winsock}" = "xyes" ; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 10758,10767 ****
  _ACEOF
  
! 	else
! 	   LIBS=${ORIG_LIBS};
  	fi
  
     fi
  
     echo "$as_me:$LINENO: checking for winver.h" >&5
  echo $ECHO_N "checking for winver.h... $ECHO_C" >&6
--- 10688,10702 ----
  _ACEOF
  
! 		else
! 		   LIBS=${ORIG_LIBS};
! 		fi
! 
! 
  	fi
  
     fi
  
+ 	   ## AC_MSG_NOTICE([LIBS=${LIBS}])
+ 
     echo "$as_me:$LINENO: checking for winver.h" >&5
  echo $ECHO_N "checking for winver.h... $ECHO_C" >&6
***************
*** 10818,10822 ****
  
  
! for ac_header in toolhelp.h dos.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--- 10753,10758 ----
  
  
! 
! for ac_header in toolhelp.h dos.h io.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
***************
*** 11204,11207 ****
--- 11140,11144 ----
  
  fi
+ 	   ## AC_MSG_NOTICE([LIBS=${LIBS}])
  
  ac_ext=cc
***************
*** 12150,12153 ****
--- 12087,12092 ----
  
  
+ 	   ## AC_MSG_NOTICE([LIBS=${LIBS}])
+ 
  if test "x${check_for_windows_stuff}" = "xyes" ; then
  
***************
*** 13015,13018 ****
--- 12954,12959 ----
  fi
  
+ 	   ## AC_MSG_NOTICE([LIBS=${LIBS}])
+ 
  echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
  echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6
***************
*** 13673,13679 ****
  
  
- if test "x${with_posix_threads}" = "xno" ; then
-    with_libpthread=no;
- fi
  
  if test "x${with_posix_threads}" = "xyes" ; then
--- 13614,13617 ----
***************
*** 13783,13790 ****
  
  fi
  
  
  
- if test "x${with_libpthread}" = "xyes" ; then
  
  echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--- 13721,13734 ----
  
  fi
+ if test $ac_cv_header_pthread_h = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_PTHREAD_H 1
+ _ACEOF
+ 
+ fi
  
  
  
  
  echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
***************
*** 13852,13961 ****
  fi
  
- fi
- 
- 
- if test "${ac_cv_header_pthread_h+set}" = set; then
-   echo "$as_me:$LINENO: checking for pthread.h" >&5
- echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
- if test "${ac_cv_header_pthread_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
- echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
- echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
- else
-   # Is the header compilable?
- echo "$as_me:$LINENO: checking pthread.h usability" >&5
- echo $ECHO_N "checking pthread.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
- $ac_includes_default
- #include <pthread.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- ac_header_compiler=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
- 
- # Is the header present?
- echo "$as_me:$LINENO: checking pthread.h presence" >&5
- echo $ECHO_N "checking pthread.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
- #include <pthread.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-   else
-     ac_cpp_err=
-   fi
- else
-   ac_cpp_err=yes
- fi
- if test -z "$ac_cpp_err"; then
-   ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
- echo "${ECHO_T}$ac_header_preproc" >&6
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc in
-   yes:no )
-     { echo "$as_me:$LINENO: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-     { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;};;
-   no:yes )
-     { echo "$as_me:$LINENO: WARNING: pthread.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;}
-     { echo "$as_me:$LINENO: WARNING: pthread.h: check for missing prerequisite headers?" >&5
- echo "$as_me: WARNING: pthread.h: check for missing prerequisite headers?" >&2;}
-     { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;};;
- esac
- echo "$as_me:$LINENO: checking for pthread.h" >&5
- echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
- if test "${ac_cv_header_pthread_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_cv_header_pthread_h=$ac_header_preproc
- fi
- echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
- echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
- 
- fi
- 
- 
  
  echo "$as_me:$LINENO: checking for pthread_create" >&5
--- 13796,13799 ----
***************
*** 14635,14640 ****
  
  		CPPFLAGS="${CPPFLAGS} -DNO_THREADS"
! 		{ echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
  
  	   else
--- 14473,14477 ----
  
  		CPPFLAGS="${CPPFLAGS} -DNO_THREADS"
! 		## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  
  	   else
***************
*** 15041,15046 ****
  
  		CPPFLAGS="${CPPFLAGS} -DNO_THREADS"
! 		{ echo "$as_me:$LINENO: CPPFLAGS : ${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS : ${CPPFLAGS}" >&6;}
  
  	   else
--- 14878,14882 ----
  
  		CPPFLAGS="${CPPFLAGS} -DNO_THREADS"
! 		## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  
  	   else
***************
*** 16199,16204 ****
  	      windows_shared_memory_available=yes;
  	      CPPFLAGS="${CPPFLAGS} -DWIN32"
! 	      { echo "$as_me:$LINENO: CPPFLAGS=${CPPFLAGS}" >&5
! echo "$as_me: CPPFLAGS=${CPPFLAGS}" >&6;}
  	   else
  		{ { echo "$as_me:$LINENO: error: NO Shared Memory seems go be available. Consider --disable-shmem" >&5
--- 16035,16039 ----
  	      windows_shared_memory_available=yes;
  	      CPPFLAGS="${CPPFLAGS} -DWIN32"
! 	      ## AC_MSG_NOTICE([CPPFLAGS=${CPPFLAGS}])
  	   else
  		{ { echo "$as_me:$LINENO: error: NO Shared Memory seems go be available. Consider --disable-shmem" >&5
***************
*** 17115,17120 ****
           LTLIBOBJS="${LTLIBOBJS} unix_sem.lo"
     fi
!    { echo "$as_me:$LINENO: LTLIBOBJS : ${LTLIBOBJS}" >&5
! echo "$as_me: LTLIBOBJS : ${LTLIBOBJS}" >&6;}
  fi
  
--- 16950,16954 ----
           LTLIBOBJS="${LTLIBOBJS} unix_sem.lo"
     fi
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
  fi
  

Index: configure.ac
===================================================================
RCS file: /cvsroot/emc/rcslib/configure.ac,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -d -r1.3.2.3 -r1.3.2.4
*** configure.ac	21 Aug 2003 20:24:13 -0000	1.3.2.3
--- configure.ac	22 Aug 2003 03:34:26 -0000	1.3.2.4
***************
*** 8,12 ****
  AC_MSG_NOTICE([PLEASE READ THE INSTALL FILE])
  
! CONFIGURED_PROGRAMS="nmltest nmlcfg nmlclean";
  CONFIGURED_STATIC_LIBRARIES=""
  CONFIGURED_SUBDIRS=
--- 8,12 ----
  AC_MSG_NOTICE([PLEASE READ THE INSTALL FILE])
  
! CONFIGURED_PROGRAMS='nmltest$(EXEEXT) nmlcfg$(EXEEXT) nmlclean$(EXEEXT)'
  CONFIGURED_STATIC_LIBRARIES=""
  CONFIGURED_SUBDIRS=
***************
*** 49,64 ****
  
  
- AC_ARG_WITH(libpthread,
- 	[AC_HELP_STRING([--with-libpthread],
- 	[Check for libpthread and use if found. (default=yes)])],
- 	[with_libpthread=$withval;
- 	AC_MSG_NOTICE([with_libpthread=${with_libpthread}])],
- 	[with_libpthread=no]
- 	)
- 
- 
  AC_ARG_WITH(posix_threads,
  	[AC_HELP_STRING([--with-posix_threads],
! 	[Check for POSIX threads and use if found. (You may need to seperately enable libpthread.) (default=yes)])],
  	[with_posix_threads=$withval;
  	AC_MSG_NOTICE([with_posix_threads=${with_posix_threads}])],
--- 49,55 ----
  
  
  AC_ARG_WITH(posix_threads,
  	[AC_HELP_STRING([--with-posix_threads],
! 	[Check for POSIX threads and use if found. (default=yes)])],
  	[with_posix_threads=$withval;
  	AC_MSG_NOTICE([with_posix_threads=${with_posix_threads}])],
***************
*** 293,305 ****
  
  if test "x${enable_xsd2nmlh}" = "xyes" ; then
!    CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} xsd2nmlh"
!    AC_MSG_NOTICE([CONFIGURED_PROGRAMS=${CONFIGURED_PROGRAMS}])
  fi
  
  if test "x${enable_filemem}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} filemem.lo"
!    AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_FILEMEM"
!    AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
   
  fi
--- 284,296 ----
  
  if test "x${enable_xsd2nmlh}" = "xyes" ; then
!    CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} 'xsd2nmlh$(EXEEXT)'"
!    ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS=${CONFIGURED_PROGRAMS}])
  fi
  
  if test "x${enable_filemem}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} filemem.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_FILEMEM"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
   
  fi
***************
*** 307,313 ****
  if test "x${enable_shmem}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} shmem.lo _shm.lo shm.lo sem.lo memsem.lo autokey.lo"
!    AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_SHMEM"
!    AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
   
  fi
--- 298,304 ----
  if test "x${enable_shmem}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} shmem.lo _shm.lo shm.lo sem.lo memsem.lo autokey.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_SHMEM"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
   
  fi
***************
*** 317,321 ****
  if test "x${enable_posemath_in_rcslib}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} _posemath.lo mathprnt.lo sincos.lo posemath.lo"
!    AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
  fi
  
--- 308,312 ----
  if test "x${enable_posemath_in_rcslib}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} _posemath.lo mathprnt.lo sincos.lo posemath.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
  fi
  
***************
*** 323,327 ****
  if test "x${enable_nmlmod_in_rcslib}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} nml_mod.lo cmd_msg.lo stat_msg.lo nml_oi.lo"
!    AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
  fi
  
--- 314,318 ----
  if test "x${enable_nmlmod_in_rcslib}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} nml_mod.lo cmd_msg.lo stat_msg.lo nml_oi.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
  fi
  
***************
*** 333,339 ****
     fi
     enable_sokintrf=yes
!    AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_HTTP"
!    AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
     enable_xml=yes;
  fi
--- 324,330 ----
     fi
     enable_sokintrf=yes
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_HTTP"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
     enable_xml=yes;
  fi
***************
*** 341,354 ****
  if test "x${enable_tty}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} ttymem.lo tty_srv.lo ttyintf.lo"
!    AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_TTY"
!    AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  fi
  
  if test "x${enable_locmem}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} locmem.lo"
!    AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_LOCMEM"
!    AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
   
  fi
--- 332,345 ----
  if test "x${enable_tty}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} ttymem.lo tty_srv.lo ttyintf.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_TTY"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  fi
  
  if test "x${enable_locmem}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} locmem.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_LOCMEM"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
   
  fi
***************
*** 357,363 ****
  if test "x${enable_phantom}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} phantom.lo"
!    AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_PHANTOM"
!    AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
   
  fi
--- 348,354 ----
  if test "x${enable_phantom}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} phantom.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_PHANTOM"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
   
  fi
***************
*** 370,376 ****
     fi
     enable_sokintrf=yes
!    AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_STCP"
!    AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
   
  fi
--- 361,367 ----
     fi
     enable_sokintrf=yes
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_STCP"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
   
  fi
***************
*** 384,390 ****
     fi
     enable_sokintrf=yes
!    AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_TCP"
!    AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  #   CONFIGURED_LTLIBRARIES="${CONFIGURED_LTLIBRARIES} libcmstcp.la"
  #   AC_MSG_NOTICE([CONFIGURED_LTLIBRARIES=${CONFIGURED_LTLIBRARIES}])
--- 375,381 ----
     fi
     enable_sokintrf=yes
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_TCP"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  #   CONFIGURED_LTLIBRARIES="${CONFIGURED_LTLIBRARIES} libcmstcp.la"
  #   AC_MSG_NOTICE([CONFIGURED_LTLIBRARIES=${CONFIGURED_LTLIBRARIES}])
***************
*** 399,405 ****
     fi
     enable_sokintrf=yes
!    AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_UDP"
!    AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
   
  fi
--- 390,396 ----
     fi
     enable_sokintrf=yes
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_UDP"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
   
  fi
***************
*** 407,413 ****
  if test "x${enable_crypt}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} crypt2.lo"
!    AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_CRYPT2"
!    AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
   
  fi
--- 398,404 ----
  if test "x${enable_crypt}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} crypt2.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_CRYPT2"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
   
  fi
***************
*** 416,422 ****
  if test "x${enable_xml}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} cms_xml_up.lo"
!    AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_XML"
!    AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
   
  fi
--- 407,413 ----
  if test "x${enable_xml}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} cms_xml_up.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_XML"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
   
  fi
***************
*** 424,444 ****
  if test "x${enable_xdr}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} cms_xup.lo"
!    AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_XDR"
!    AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  fi
  
  if test "x${enable_disp}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} cms_dup.lo"
!    AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_DISP"
!    AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  fi
  
  if test "x${enable_diag}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} cmsdiag.lo nmldiag.lo"
!    AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_DIAG"
!    AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
   
  fi
--- 415,435 ----
  if test "x${enable_xdr}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} cms_xup.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_XDR"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  fi
  
  if test "x${enable_disp}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} cms_dup.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_DISP"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  fi
  
  if test "x${enable_diag}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} cmsdiag.lo nmldiag.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_DIAG"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
   
  fi
***************
*** 447,461 ****
  if test "x${enable_print}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} rcs_prnt.lo"
!    AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
  else
     CPPFLAGS="${CPPFLAGS} -DDISABLE_RCS_PRINT"
!    AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  fi
  
  if test "x${enable_nmlqr}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} nmlqr.lo"
!    AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_NMLQR"
!    AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
   
  fi
--- 438,452 ----
  if test "x${enable_print}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} rcs_prnt.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
  else
     CPPFLAGS="${CPPFLAGS} -DDISABLE_RCS_PRINT"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  fi
  
  if test "x${enable_nmlqr}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} nmlqr.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_NMLQR"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
   
  fi
***************
*** 463,469 ****
  if test "x${enable_server}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} cms_srv.lo nml_srv.lo cmssvrp.lo"
!    AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_SUPPORT_SERVER"
!    AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
     enable_sokintrf=yes 
  fi
--- 454,460 ----
  if test "x${enable_server}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} cms_srv.lo nml_srv.lo cmssvrp.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_SUPPORT_SERVER"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
     enable_sokintrf=yes 
  fi
***************
*** 471,490 ****
  if test "x${enable_sokintrf}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} sokintrf.lo"
!    AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_SOKINTRF"
!    AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  fi
  
  if test "x${enable_diagapplet_jar}" = "xyes" ; then
     CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} diagapplet.jar CodeGen.jar CodeGenCmdLine.jar rcs.jar";
!    AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
  
  elif test "x${enable_codegen_jar}" = "xyes" ; then
     CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} CodeGen.jar CodeGenCmdLine.jar rcs.jar";
!    AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
  
  elif test "x${enable_rcs_jar}" = "xyes" ; then
     CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} rcs.jar";
!    AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
  
  fi
--- 462,481 ----
  if test "x${enable_sokintrf}" = "xyes" ; then
     LTLIBOBJS="${LTLIBOBJS} sokintrf.lo"
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
     CPPFLAGS="${CPPFLAGS} -DCMS_USE_SOKINTRF"
!    ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  fi
  
  if test "x${enable_diagapplet_jar}" = "xyes" ; then
     CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} diagapplet.jar CodeGen.jar CodeGenCmdLine.jar rcs.jar";
!    ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
  
  elif test "x${enable_codegen_jar}" = "xyes" ; then
     CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} CodeGen.jar CodeGenCmdLine.jar rcs.jar";
!    ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
  
  elif test "x${enable_rcs_jar}" = "xyes" ; then
     CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} rcs.jar";
!    ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
  
  fi
***************
*** 544,550 ****
         ac_cv_have_xdr_h=yes
         CPPFLAGS="${CPPFLAGS} -I${srcdir}/src/nt_xdr";
!        AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
         LTLIBOBJS="${LTLIBOBJS} bcopy.lo xdr.lo xdr_arra.lo xdr_floa.lo xdr_mem.lo xdr_rec.lo xdr_refe.lo xdr_stdi.lo";
!        AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
      fi
  
--- 535,541 ----
         ac_cv_have_xdr_h=yes
         CPPFLAGS="${CPPFLAGS} -I${srcdir}/src/nt_xdr";
!        ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
         LTLIBOBJS="${LTLIBOBJS} bcopy.lo xdr.lo xdr_arra.lo xdr_floa.lo xdr_mem.lo xdr_rec.lo xdr_refe.lo xdr_stdi.lo";
!        ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
      fi
  
***************
*** 562,569 ****
  
        GCJFLAGS="${GCJFLAGS} -I${srcdir}/src/java"
!       AC_MSG_NOTICE([GCJ : ${GCJ}])
!       AC_MSG_NOTICE([GCJFLAGS : ${GCJFLAGS}])
!       CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} nml_codegen";
!       AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
  
     fi
--- 553,560 ----
  
        GCJFLAGS="${GCJFLAGS} -I${srcdir}/src/java"
!       ## AC_MSG_NOTICE([GCJ : ${GCJ}])
!       ## AC_MSG_NOTICE([GCJFLAGS : ${GCJFLAGS}])
!       CONFIGURED_PROGRAMS="${CONFIGURED_PROGRAMS} 'nml_codegen$(EXEEXT)'";
!       ## AC_MSG_NOTICE([CONFIGURED_PROGRAMS : ${CONFIGURED_PROGRAMS}])
  
     fi
***************
*** 579,588 ****
  
        CONFIGURED_STATIC_LIBRARIES="${CONFIGURED_STATIC_LIBRARIES} librcsrtl.a";
!       AC_MSG_NOTICE([CONFIGURED_STATIC_LIBRARIES : ${CONFIGURED_STATIC_LIBRARIES}]);
        if test "x${enable_rtlmem}" = "xyes" ; then
  	 LTLIBOBJS="${LTLIBOBJS} rtlnml.lo	rtlmem.lo rtlinux_user_api_implement.lo"
! 	 AC_MSG_NOTICE([LTLIBOBJS=${LTLIBOBJS}])
  	 CPPFLAGS="${CPPFLAGS} -DCMS_USE_RTLMEM"
! 	 AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
        fi
  
--- 570,579 ----
  
        CONFIGURED_STATIC_LIBRARIES="${CONFIGURED_STATIC_LIBRARIES} librcsrtl.a";
!       ## AC_MSG_NOTICE([CONFIGURED_STATIC_LIBRARIES : ${CONFIGURED_STATIC_LIBRARIES}]);
        if test "x${enable_rtlmem}" = "xyes" ; then
  	 LTLIBOBJS="${LTLIBOBJS} rtlnml.lo	rtlmem.lo rtlinux_user_api_implement.lo"
! 	 ## AC_MSG_NOTICE([LTLIBOBJS=${LTLIBOBJS}])
  	 CPPFLAGS="${CPPFLAGS} -DCMS_USE_RTLMEM"
! 	 ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
        fi
  
***************
*** 593,603 ****
  			if test "x${HAVE_RTAI}" = "xYES" ; then
  				   CONFIGURED_STATIC_LIBRARIES="${CONFIGURED_STATIC_LIBRARIES} librcsrtai.a";
! 				   AC_MSG_NOTICE([CONFIGURED_STATIC_LIBRARIES : ${CONFIGURED_STATIC_LIBRARIES}]);
  				   if test "x${enable_rtlmem}" = "xyes" ; then
  
  				      LTLIBOBJS="${LTLIBOBJS} rtlnml.lo	rtlmem.lo rtai_user_api_implement.lo"
! 				      AC_MSG_NOTICE([LTLIBOBJS=${LTLIBOBJS}])
  				      CPPFLAGS="${CPPFLAGS} -DCMS_USE_RTLMEM"
! 				      AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  				   fi
  			fi
--- 584,594 ----
  			if test "x${HAVE_RTAI}" = "xYES" ; then
  				   CONFIGURED_STATIC_LIBRARIES="${CONFIGURED_STATIC_LIBRARIES} librcsrtai.a";
! 				   ## AC_MSG_NOTICE([CONFIGURED_STATIC_LIBRARIES : ${CONFIGURED_STATIC_LIBRARIES}]);
  				   if test "x${enable_rtlmem}" = "xyes" ; then
  
  				      LTLIBOBJS="${LTLIBOBJS} rtlnml.lo	rtlmem.lo rtai_user_api_implement.lo"
! 				      ## AC_MSG_NOTICE([LTLIBOBJS=${LTLIBOBJS}])
  				      CPPFLAGS="${CPPFLAGS} -DCMS_USE_RTLMEM"
! 				      ## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  				   fi
  			fi
***************
*** 677,685 ****
  		)
  
! 	AC_MSG_NOTICE([ac_cv_have_winsock2=${ac_cv_have_winsock2}])
  
  	if test "x${ac_cv_have_winsock2}" = "xyes" ; then
  	   AC_DEFINE(HAVE_WINSOCK2_H,1,[Define to 1 you have a working winsock2.h  and ws2_32.lib system.])
! 
  	else
             
--- 668,676 ----
  		)
  
! 	## AC_MSG_NOTICE([ac_cv_have_winsock2=${ac_cv_have_winsock2}])
  
  	if test "x${ac_cv_have_winsock2}" = "xyes" ; then
  	   AC_DEFINE(HAVE_WINSOCK2_H,1,[Define to 1 you have a working winsock2.h  and ws2_32.lib system.])
! 	   ## AC_MSG_NOTICE([LIBS=${LIBS}])
  	else
             
***************
*** 712,726 ****
  			)
  
- 	
- 	fi
  
! 	if test "x${ac_cv_have_winsock}" = "xyes" ; then
! 	   AC_DEFINE(HAVE_WINSOCK_H,1, [Define to 1 you have a working winsock.h and wsock32.lib system.])
! 	else
! 	   LIBS=${ORIG_LIBS};
  	fi
  
     fi
  
     AC_CHECK_HEADER([winver.h],
  		[ac_cv_have_winver_h=yes],
--- 703,720 ----
  			)
  
  
! 		if test "x${ac_cv_have_winsock}" = "xyes" ; then
! 		   AC_DEFINE(HAVE_WINSOCK_H,1, [Define to 1 you have a working winsock.h and wsock32.lib system.])
! 		else
! 		   LIBS=${ORIG_LIBS};
! 		fi
! 
! 	
  	fi
  
     fi
  
+ 	   ## AC_MSG_NOTICE([LIBS=${LIBS}])
+ 
     AC_CHECK_HEADER([winver.h],
  		[ac_cv_have_winver_h=yes],
***************
*** 734,738 ****
     fi
  		
!    AC_CHECK_HEADERS([toolhelp.h dos.h])
  
     AC_CACHE_CHECK([for GetTickCount],
--- 728,732 ----
     fi
  		
!    AC_CHECK_HEADERS([toolhelp.h dos.h io.h])
  
     AC_CACHE_CHECK([for GetTickCount],
***************
*** 832,835 ****
--- 826,830 ----
  
  fi
+ 	   ## AC_MSG_NOTICE([LIBS=${LIBS}])
  
  AC_LANG_PUSH(C++)
***************
*** 848,851 ****
--- 843,848 ----
  AC_CHECK_TYPE([caddr_t])
  
+ 	   ## AC_MSG_NOTICE([LIBS=${LIBS}])
+ 
  if test "x${check_for_windows_stuff}" = "xyes" ; then
  
***************
*** 923,926 ****
--- 920,925 ----
  AC_SEARCH_LIBS(socket,[socket xnet ws2_32 winsock])
  AC_CHECK_LIB(m,fabs)
+ 	   ## AC_MSG_NOTICE([LIBS=${LIBS}])
+ 
  AC_SEARCH_LIBS(gethostbyname,[socket nsl resolv xnet])
  
***************
*** 940,946 ****
  AC_CHECK_FUNCS([clock_gettime getcwd gethostbyaddr gethostbyname gethostname gettimeofday getwd inet_ntoa select socket sqrt strchr strcspn strdup strerror strpbrk strrchr strstr strtol strtoul toupper uname sysinfo sysconf sleep usleep nanosleep setitimer sincos fstat opendir readdir])
  
- if test "x${with_posix_threads}" = "xno" ; then
-    with_libpthread=no;
- fi
  
  if test "x${with_posix_threads}" = "xyes" ; then
--- 939,942 ----
***************
*** 948,959 ****
  AC_MSG_NOTICE([checking POSIX threads])
  
! AC_CHECK_HEADER([pthread.h])
! 
! if test "x${with_libpthread}" = "xyes" ; then
!    AC_CHECK_LIB(pthread,pthread_create)
! fi
! 
  
! AC_CHECK_HEADER(pthread.h)
  
  AC_CHECK_FUNC(pthread_create,
--- 944,951 ----
  AC_MSG_NOTICE([checking POSIX threads])
  
! AC_CHECK_HEADER([pthread.h],
! 	[AC_DEFINE(HAVE_PTHREAD_H,1,[Define to 1 if you have the pthread.h file])])
  
! AC_CHECK_LIB(pthread,pthread_create)
  
  AC_CHECK_FUNC(pthread_create,
***************
*** 1013,1017 ****
  		AC_DEFINE(NO_THREADS,1,[if no thread system is available])
  		CPPFLAGS="${CPPFLAGS} -DNO_THREADS"
! 		AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  
  	   else
--- 1005,1009 ----
  		AC_DEFINE(NO_THREADS,1,[if no thread system is available])
  		CPPFLAGS="${CPPFLAGS} -DNO_THREADS"
! 		## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  
  	   else
***************
*** 1063,1067 ****
  		AC_DEFINE(NO_THREADS,1,[if no thread system is available])
  		CPPFLAGS="${CPPFLAGS} -DNO_THREADS"
! 		AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  
  	   else
--- 1055,1059 ----
  		AC_DEFINE(NO_THREADS,1,[if no thread system is available])
  		CPPFLAGS="${CPPFLAGS} -DNO_THREADS"
! 		## AC_MSG_NOTICE([CPPFLAGS : ${CPPFLAGS}])
  
  	   else
***************
*** 1426,1430 ****
  	      windows_shared_memory_available=yes;
  	      CPPFLAGS="${CPPFLAGS} -DWIN32"
! 	      AC_MSG_NOTICE([CPPFLAGS=${CPPFLAGS}])
  	   else
  		AC_MSG_ERROR([NO Shared Memory seems go be available. Consider --disable-shmem])
--- 1418,1422 ----
  	      windows_shared_memory_available=yes;
  	      CPPFLAGS="${CPPFLAGS} -DWIN32"
! 	      ## AC_MSG_NOTICE([CPPFLAGS=${CPPFLAGS}])
  	   else
  		AC_MSG_ERROR([NO Shared Memory seems go be available. Consider --disable-shmem])
***************
*** 1606,1610 ****
           LTLIBOBJS="${LTLIBOBJS} unix_sem.lo"
     fi
!    AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
  fi
  
--- 1598,1602 ----
           LTLIBOBJS="${LTLIBOBJS} unix_sem.lo"
     fi
!    ## AC_MSG_NOTICE([LTLIBOBJS : ${LTLIBOBJS}])
  fi
  

Index: rcs_config.h.in
===================================================================
RCS file: /cvsroot/emc/rcslib/rcs_config.h.in,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** rcs_config.h.in	21 Aug 2003 20:24:13 -0000	1.1.2.4
--- rcs_config.h.in	22 Aug 2003 03:34:26 -0000	1.1.2.5
***************
*** 73,76 ****
--- 73,79 ----
  #undef HAVE_IOSTREAM_H
  
+ /* Define to 1 if you have the <io.h> header file. */
+ #undef HAVE_IO_H
+ 
  /* Define to 1 if you have the `m' library (-lm). */
  #undef HAVE_LIBM
***************
*** 114,117 ****
--- 117,123 ----
  /* Define to 1 if you have the process.h file */
  #undef HAVE_PROCESS_H
+ 
+ /* Define to 1 if you have the pthread.h file */
+ #undef HAVE_PTHREAD_H
  
  /* Define to 1 if you have the QueryPerformanceCounter function. */