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