[Emc-commit] rcslib/src/print Makefile,4.33,4.33.2.1 Makefile.lib,4.31,4.31.2.1 rcs_prnt.cc,4.43,4.43.2.1 rcs_prnt.hh,4.38,4.38.2.1

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

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

Modified Files:
      Tag: wps_multiplat_dev_branch
	Makefile Makefile.lib rcs_prnt.cc rcs_prnt.hh 
Log Message:
First commit on wps_multiplat_dev_branch

Index: Makefile
===================================================================
RCS file: /cvsroot/emc/rcslib/src/print/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	8 Aug 2003 14:21:14 -0000	4.33.2.1
***************
*** 12,21 ****
  
  # Declare which files are to be released
! HEADERS = rcs_prnt.hh \
! 	win_prnt.hh
  
! SRCS =	rcs_prnt.cc
  
! OBJS = $(LIBRCS_OBJS)
  
  LIBS =
--- 12,20 ----
  
  # Declare which files are to be released
! HEADERS= $(PRINT_HEADERS)
  
! SRCS =	rcs_prnt.cc sepwords.cc
  
! OBJS = $(PRINT_OBJS)
  
  LIBS =

Index: Makefile.lib
===================================================================
RCS file: /cvsroot/emc/rcslib/src/print/Makefile.lib,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1
*** Makefile.lib	27 Oct 2000 21:08:33 -0000	4.31
--- Makefile.lib	8 Aug 2003 14:21:14 -0000	4.31.2.1
***************
*** 1,2 ****
  LIBRCS_OBJS :=	$(LIBRCS_OBJS) \
! 	rcs_prnt.o
--- 1,12 ----
+ 
+ PRINT_OBJS := \
+ 	rcs_prnt.o \
+ 	sepwords.o
+ 
+ 
  LIBRCS_OBJS :=	$(LIBRCS_OBJS) \
! 	$(PRINT_OBJS)
! 
! PRINT_HEADERS = rcs_prnt.hh \
! 	win_prnt.hh
! 

Index: rcs_prnt.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/print/rcs_prnt.cc,v
retrieving revision 4.43
retrieving revision 4.43.2.1
diff -C2 -d -r4.43 -r4.43.2.1
*** rcs_prnt.cc	6 May 2003 15:18:21 -0000	4.43
--- rcs_prnt.cc	8 Aug 2003 14:21:14 -0000	4.43.2.1
***************
*** 395,428 ****
  
  
- 
- /* In windows DLLs for Microsoft Visual C++ sscanf is not supported so
- use separate_words to parse the string followed by commands like strtod to
- convert each word. */
- int RCS_EXPORT
- separate_words (char RCS_FAR ** _dest, int _max, char RCS_FAR * _src)
- {
-   static char word_buffer[256];
-   int i;
-   if (NULL == _dest || NULL == _src)
-     {
-       return -1;
-     }
-   if (strlen (_src) > 255)
-     {
-       return -1;
-     }
-   strcpy (word_buffer, _src);
-   _dest[0] = strtok (word_buffer, " \n\r\t");
-   for (i = 0; NULL != _dest[i] && i < _max - 1; i++)
-     {
-       _dest[i + 1] = strtok (NULL, " \n\r\t");
-     }
-   if (_dest[_max - 1] == NULL && i == _max - 1)
-     {
-       i--;
-     }
-   return (i + 1);
- }
- 
  void RCS_EXPORT
  bad_char_to_print (char *ptr)
--- 395,398 ----

Index: rcs_prnt.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/print/rcs_prnt.hh,v
retrieving revision 4.38
retrieving revision 4.38.2.1
diff -C2 -d -r4.38 -r4.38.2.1
*** rcs_prnt.hh	6 May 2003 15:18:21 -0000	4.38
--- rcs_prnt.hh	8 Aug 2003 14:21:14 -0000	4.38.2.1
***************
*** 3,6 ****
--- 3,31 ----
  #define RCS_PRNT_HH
  
+ #ifdef DISABLE_RCS_PRINT
+ 
+ #define rcs_puts if(0)
+ #define rcs_print if(0)
+ #define rcs_print_debug if(0)
+ #define rcs_print_error if(0)
+ #define rcs_print_sys_error if(0)
+ #define set_rcs_print_flag(x)
+ #define set_rcs_print_destination(x)
+ #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 */
  
***************
*** 25,28 ****
--- 50,54 ----
  #endif
  
+ 
  #if defined(__CPLUSPLUS__) || defined(__cplusplus)
  #include "linklist.hh"		/* RCS_LINKED_LIST */
***************
*** 109,112 ****
--- 135,141 ----
  #endif
  
+ #endif
+ // #ifdef DISABLE_RCS_PRINT
+ 
  /* Print MODE flags. */
  #define PRINT_RCS_ERRORS                0x00000001	/* 1 */
***************
*** 164,167 ****
--- 193,198 ----
  #endif
  
+ #ifndef DISABLE_RCS_PRINT
+ 
  #if defined(__CPLUSPLUS__) || defined(__cplusplus)
  extern "C"
***************
*** 204,207 ****
--- 235,240 ----
  extern char last_error_bufs[4][100];
  extern int last_error_buf_filled;
+ 
+ #endif
  
  #endif