[Emc-commit] rcslib/src/cms cms_xml_up.cc,4.5.2.3,4.5.2.4 nmltest.cc,4.37.2.3,4.37.2.4 sokintrf.c,4.35.2.9,4.35.2.10 sokintrf.h,4.34.2.7,4.34.2.8 tcp_opts.cc,4.36.2.2,4.36.2.3

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

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

Modified Files:
      Tag: wps_multiplat_dev_branch
	cms_xml_up.cc nmltest.cc sokintrf.c sokintrf.h tcp_opts.cc 
Log Message:
.

Index: cms_xml_up.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/cms_xml_up.cc,v
retrieving revision 4.5.2.3
retrieving revision 4.5.2.4
diff -C2 -d -r4.5.2.3 -r4.5.2.4
*** cms_xml_up.cc	25 Sep 2003 14:34:48 -0000	4.5.2.3
--- cms_xml_up.cc	26 Sep 2003 19:52:37 -0000	4.5.2.4
***************
*** 2577,2584 ****
    if(is_msg_def)
      {
!       fprintf(f,"class OE_Data_Message_%s: public OE_Data_Message\n",name);
        fprintf(f,"{\n");
        fprintf(f,"public:\n");
!       fprintf(f,"\tOE_Data_Message_%s(void): OE_Data_Message(%s_TYPE,sizeof(OE_Data_Message_%s),%s_format) {};\n",name,name,name,shortfname);
        fprintf(f,"\tvoid update(CMS *);\n");
        fprintf(f,"\n");
--- 2577,2584 ----
    if(is_msg_def)
      {
!       fprintf(f,"class OE_Data_Message_%s: public nml_oe::OE_Data_Message\n",name);
        fprintf(f,"{\n");
        fprintf(f,"public:\n");
!       fprintf(f,"\tOE_Data_Message_%s(void): nml_oe::OE_Data_Message(%s_TYPE,sizeof(OE_Data_Message_%s),%s_format) {};\n",name,name,name,shortfname);
        fprintf(f,"\tvoid update(CMS *);\n");
        fprintf(f,"\n");

Index: nmltest.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/nmltest.cc,v
retrieving revision 4.37.2.3
retrieving revision 4.37.2.4
diff -C2 -d -r4.37.2.3 -r4.37.2.4
*** nmltest.cc	29 Aug 2003 14:07:30 -0000	4.37.2.3
--- nmltest.cc	26 Sep 2003 19:52:38 -0000	4.37.2.4
***************
*** 148,152 ****
--- 148,154 ----
    int wait_for_read = -1;
    int test_all = -1;
+ #ifdef ENABLE_RCS_DIAG
    int show_diag_info = -1;
+ #endif
    int use_passwd = 0;
    if (argc > 4)
***************
*** 189,194 ****
--- 191,198 ----
  
    char proc_name[80];
+ #ifdef ENABLE_RCS_NMLMOD
    int cmd_type = 0;
    int stat_type = 0;
+ #endif
    int dump_hex_data = 0;
    if (test_all)

Index: sokintrf.c
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/sokintrf.c,v
retrieving revision 4.35.2.9
retrieving revision 4.35.2.10
diff -C2 -d -r4.35.2.9 -r4.35.2.10
*** sokintrf.c	25 Sep 2003 14:34:49 -0000	4.35.2.9
--- sokintrf.c	26 Sep 2003 19:52:38 -0000	4.35.2.10
***************
*** 709,712 ****
--- 709,713 ----
  }
  
+ #if 0
  int
  dl_inet_netof (struct in_addr addr)
***************
*** 718,721 ****
--- 719,723 ----
  #endif
  }
+ #endif
  
  int

Index: sokintrf.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/sokintrf.h,v
retrieving revision 4.34.2.7
retrieving revision 4.34.2.8
diff -C2 -d -r4.34.2.7 -r4.34.2.8
*** sokintrf.h	25 Sep 2003 14:34:49 -0000	4.34.2.7
--- sokintrf.h	26 Sep 2003 19:52:38 -0000	4.34.2.8
***************
*** 49,53 ****
  
    char *dl_inet_ptr_ntoa (struct in_addr *);
-   int dl_inet_ptr_netof (struct in_addr *);
    //  struct in_addr dl_inet_makeaddr (const int net, const int lna);
    int dl_gethostname (char *hostname, int maxlen);
--- 49,52 ----

Index: tcp_opts.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/tcp_opts.cc,v
retrieving revision 4.36.2.2
retrieving revision 4.36.2.3
diff -C2 -d -r4.36.2.2 -r4.36.2.3
*** tcp_opts.cc	6 Sep 2003 00:12:34 -0000	4.36.2.2
--- tcp_opts.cc	26 Sep 2003 19:52:38 -0000	4.36.2.3
***************
*** 98,104 ****
--- 98,106 ----
  make_tcp_socket_blocking (int socket_fd)
  {
+ #if MS_WINDOWS_API
    int sockerrno;
    const char *sockerrstr;
    char sockerrbuf[256];
+ #endif
  
  #if MS_WINDOWS_API