Fri Jun 5 20:42:42 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>

8 files changed, 52 insertions, 40 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6a363401642..8d83be3dbf9 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,11 +1,23 @@
+Fri Jun  5 20:42:42 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * TAO_IDL/contrib/mcpp/directive.cpp:
+        * TAO_IDL/contrib/mcpp/eval.cpp:
+        * TAO_IDL/contrib/mcpp/internal.H:
+        * TAO_IDL/contrib/mcpp/lib.cpp:
+        * TAO_IDL/contrib/mcpp/main.cpp:
+        * TAO_IDL/contrib/mcpp/support.cpp:
+        * TAO_IDL/contrib/mcpp/system.cpp:
+
+          Porting for Borland. 
+        
 Fri Jun  5 21:01:43 UTC 2009  Yan Dai  <dai_y@ociweb.com>
 
         * orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp:
-    
-          Fixed a bug in build_tree() that ignored the user defined 
+
+          Fixed a bug in build_tree() that ignored the user defined
           constraint expression when the domain name or event type is
           defined.
-          
+
         * orbsvcs/tests/Notify/Bug_3688_Regression/Bug_3688_Regression.mpc:
         * orbsvcs/tests/Notify/Bug_3688_Regression/common.h:
         * orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp:
@@ -29,13 +41,13 @@ Fri Jun  5 21:01:43 UTC 2009  Yan Dai  <dai_y@ociweb.com>
         * bin/tao_other_tests.lst:
 
           Added Bug_3688_Regression test.
-          
+
         * orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp:
 
           Made received flag set true when consumer receives message. It did
           not show any problem is because the test defaults to not expecting
           to receive events.
-          
+
 Fri Jun  5 17:37:27 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * TAO_IDL/contrib/mcpp/directive.cpp:
diff --git a/TAO/TAO_IDL/contrib/mcpp/directive.cpp b/TAO/TAO_IDL/contrib/mcpp/directive.cpp
index 7245da44a68..7089405a3ce 100644
--- a/TAO/TAO_IDL/contrib/mcpp/directive.cpp
+++ b/TAO/TAO_IDL/contrib/mcpp/directive.cpp
@@ -1204,7 +1204,7 @@ static char *   mgtoken_save( const char * macroname)
  * Return the advanced pointer into the replacement text or 0.
  */
 {
-    char *   repl_cur;
+  char *   repl_cur;
 
     if (str_eq( macroname, identifier)) {   /* Macro name in body   */
         repl_cur = token_p;                 /* Overwrite on token   */
@@ -1304,7 +1304,7 @@ static void do_undef( void)
 static DEFBUF *     symtab[ SBSIZE];
 static long         num_of_macro = 0;
 
-#if MCPP_LIB
+#ifdef MCPP_LIB
 void    init_directive( void)
 /* Initialize static variables. */
 {
@@ -1676,7 +1676,7 @@ void    dump_def(
     wrong_line = TRUE;               /* Line number is out of sync  */
 }
 
-#if MCPP_LIB
+#ifdef MCPP_LIB
 void    clear_symtable( void)
 /*
  * Free all the macro definitions.
diff --git a/TAO/TAO_IDL/contrib/mcpp/eval.cpp b/TAO/TAO_IDL/contrib/mcpp/eval.cpp
index 71fcf453f9e..39026f6aa03 100644
--- a/TAO/TAO_IDL/contrib/mcpp/eval.cpp
+++ b/TAO/TAO_IDL/contrib/mcpp/eval.cpp
@@ -266,7 +266,7 @@ static const SIZES  size_table[] = {
 #define is_unary(op)    (FIRST_UNOP  <= op && op <= LAST_UNOP)
 
 
-#if MCPP_LIB
+#ifdef MCPP_LIB
 void    init_eval( void)
 {
     skip = 0;
diff --git a/TAO/TAO_IDL/contrib/mcpp/internal.H b/TAO/TAO_IDL/contrib/mcpp/internal.H
index 7d67af576c4..da8da7924f5 100644
--- a/TAO/TAO_IDL/contrib/mcpp/internal.H
+++ b/TAO/TAO_IDL/contrib/mcpp/internal.H
@@ -40,7 +40,7 @@
 
 #include "mcpp_out.h"
 
-#if MCPP_LIB
+#ifdef MCPP_LIB
 #include "mcpp_lib.h"   /* External interface when used as library  */
 #endif
 
@@ -199,7 +199,7 @@
 /* MB_ERROR signals wrong multi-byte character sequence.    */
 #define MB_ERROR        0x8000
 
-#if MCPP_LIB && HOST_COMPILER == GNUC   \
+#if defined(MCPP_LIB) && HOST_COMPILER == GNUC			\
         && (SYS_FAMILY == SYS_UNIX && SYSTEM != SYS_CYGWIN)
     /* For GCC 4.* on UNIXes    */
 //#pragma GCC visibility push( hidden)    /* Hide these names from outside    */
@@ -241,7 +241,7 @@ typedef struct fileinfo {
         const char *    full_fname; /* Real full path list          */
         char *          filename;   /* File/macro name (maybe changed)      */
         char *          buffer;     /* Buffer of current input line */
-#if MCPP_LIB
+#ifdef MCPP_LIB
         /* Save output functions during push/pop of #includes   */
         int (* last_fputc)  ( int c, OUTDEST od);
         int (* last_fputs)  ( const char * s, OUTDEST od);
@@ -530,12 +530,12 @@ extern void     at_end( void);
                 /* Do the final commands        */
 extern void     print_heap( void);
                 /* Print blocks of heap memory  */
-#if ! HOST_HAVE_STPCPY
+#ifndef HOST_HAVE_STPCPY
 extern char *   stpcpy( char * dest, const char * src);
                 /* Non-Standard library function*/
 #endif
 
-#if MCPP_LIB    /* Setting to use mcpp as a subroutine  */
+#ifdef MCPP_LIB    /* Setting to use mcpp as a subroutine  */
 /* directive.c  */
 extern void     clear_symtable( void);
                 /* Free all macro definitions   */
@@ -557,6 +557,6 @@ extern void     init_system( void);
 #endif
 #endif
 
-#if HOST_HAVE_STPCPY
+#ifndef HOST_HAVE_STPCPY
 extern char *   stpcpy( char * dest, const char * src);
 #endif
diff --git a/TAO/TAO_IDL/contrib/mcpp/lib.cpp b/TAO/TAO_IDL/contrib/mcpp/lib.cpp
index fac293a02f9..62cc920fada 100644
--- a/TAO/TAO_IDL/contrib/mcpp/lib.cpp
+++ b/TAO/TAO_IDL/contrib/mcpp/lib.cpp
@@ -43,7 +43,7 @@ int     opterr = 1;
 int     optopt;
 char *  optarg;
 
-#if MCPP_LIB
+#ifdef MCPP_LIB
 void    init_lib( void)
 {
     optind = 1;
diff --git a/TAO/TAO_IDL/contrib/mcpp/main.cpp b/TAO/TAO_IDL/contrib/mcpp/main.cpp
index ca448e36876..1745346270e 100644
--- a/TAO/TAO_IDL/contrib/mcpp/main.cpp
+++ b/TAO/TAO_IDL/contrib/mcpp/main.cpp
@@ -260,7 +260,7 @@ static int      src_col = 0;        /* Column number of source line */
 #define MBCHAR_IS_ESCAPE_FREE   (SJIS_IS_ESCAPE_FREE && \
             BIGFIVE_IS_ESCAPE_FREE && ISO2022_JP_IS_ESCAPE_FREE)
 
-#if MCPP_LIB
+#ifdef MCPP_LIB
 static void     init_main( void);
                 /* Initialize static variables      */
 #endif
@@ -296,7 +296,7 @@ static char *   esc_mbchar( char * str, char * str_end);
 #endif
 
 
-#if MCPP_LIB
+#ifdef MCPP_LIB
 static void     init_main( void)
 /* Initialize global variables on re-entering.  */
 {
@@ -346,7 +346,7 @@ int     main
         goto  fatal_error_exit;
     }
 
-#if MCPP_LIB
+#ifdef MCPP_LIB
     /* Initialize global and static variables.  */
     init_main();
     init_directive();
@@ -375,7 +375,7 @@ int     main
       if ((fp_in = ACE_OS::fopen( in_file, "r")) == 0) {
             mcpp_fprintf( ERR, "Can't open input file \"%s\".\n", in_file);
             errors++;
-#if MCPP_LIB
+#ifdef MCPP_LIB
             goto  fatal_error_exit;
 #else
             return( IO_ERROR);
@@ -389,7 +389,7 @@ int     main
         if ((fp_out = ACE_OS::fopen( out_file, "w")) == 0) {
             mcpp_fprintf( ERR, "Can't open output file \"%s\".\n", out_file);
             errors++;
-#if MCPP_LIB
+#ifdef MCPP_LIB
             goto  fatal_error_exit;
 #else
             return( IO_ERROR);
@@ -401,7 +401,7 @@ int     main
         if ((fp_err = ACE_OS::fopen( "mcpp.err", "a")) == 0) {
             errors++;
             mcpp_fprintf( OUT, "Can't open \"mcpp.err\"\n");
-#if MCPP_LIB
+#ifdef MCPP_LIB
             goto  fatal_error_exit;
 #else
             return( IO_ERROR);
@@ -425,7 +425,7 @@ int     main
     at_end();                       /* Do the final commands        */
 
 fatal_error_exit:
-#if MCPP_LIB
+#ifdef MCPP_LIB
     /* Free malloced memory */
     if (mcpp_debug & MACRO_CALL) {
         if (in_file != stdin_name)
diff --git a/TAO/TAO_IDL/contrib/mcpp/support.cpp b/TAO/TAO_IDL/contrib/mcpp/support.cpp
index 4e604757214..1f95270474c 100644
--- a/TAO/TAO_IDL/contrib/mcpp/support.cpp
+++ b/TAO/TAO_IDL/contrib/mcpp/support.cpp
@@ -133,7 +133,7 @@ static CAT_LINE bsl_cat_line;
 static CAT_LINE com_cat_line;
         /* Datum on the last catenated line by a line-crossing comment  */
 
-#if MCPP_LIB
+#ifdef MCPP_LIB
 static int  use_mem_buffers = FALSE;
 
 void    init_support( void)
@@ -268,7 +268,7 @@ int    mcpp_lib_fputc(
     OUTDEST od
 )
 {
-#if MCPP_LIB
+#ifdef MCPP_LIB
     if (use_mem_buffers) {
         return mem_putc( c, od);
     } else {
@@ -276,7 +276,7 @@ int    mcpp_lib_fputc(
         FILE *  stream = DEST2FP( od);
 
         return (stream != 0) ? ACE_OS::fputc( c, stream) : EOF;
-#if MCPP_LIB
+#ifdef MCPP_LIB
     }
 #endif
 }
@@ -288,7 +288,7 @@ int    mcpp_lib_fputs(
     OUTDEST od
 )
 {
-#if MCPP_LIB
+#ifdef MCPP_LIB
     if (use_mem_buffers) {
         return mem_puts( s, od);
     } else {
@@ -296,7 +296,7 @@ int    mcpp_lib_fputs(
         FILE *  stream = DEST2FP( od);
 
         return (stream != 0) ? ACE_OS::fputs( s, stream) : EOF;
-#if MCPP_LIB
+#ifdef MCPP_LIB
     }
 #endif
 }
@@ -318,7 +318,7 @@ int    mcpp_lib_fprintf(
         int rc;
 
         va_start( ap, format);
-#if MCPP_LIB
+#ifdef MCPP_LIB
         if (use_mem_buffers) {
             static char     mem_buffer[ NWORK];
 
@@ -330,7 +330,7 @@ int    mcpp_lib_fprintf(
         } else {
 #endif
 	  rc = ACE_OS::vfprintf( stream, format, ap);
-#if MCPP_LIB
+#ifdef MCPP_LIB
         }
 #endif
         va_end( ap);
@@ -344,7 +344,7 @@ int    mcpp_lib_fprintf(
 
 int (* mcpp_fprintf)( OUTDEST od, const char * format, ...) = mcpp_lib_fprintf;
 
-#if MCPP_LIB
+#ifdef MCPP_LIB
 void    mcpp_reset_def_out_func( void)
 {
     mcpp_fputc = mcpp_lib_fputc;
@@ -1608,7 +1608,7 @@ int     get_ch( void)
         infile->bptr = infile->buffer + len;
         src_line = infile->line;            /* Reset line number    */
         inc_dirp = infile->dirp;            /* Includer's directory */
-#if MCPP_LIB
+#ifdef MCPP_LIB
         mcpp_set_out_func( infile->last_fputc, infile->last_fputs,
                            infile->last_fprintf);
 #endif
@@ -2302,14 +2302,14 @@ FILEINFO *  get_file(
     } else {
         file->src_dir = 0;
     }
-#if MCPP_LIB
+#ifdef MCPP_LIB
     file->last_fputc = mcpp_lib_fputc;
     file->last_fputs = mcpp_lib_fputs;
     file->last_fprintf = mcpp_lib_fprintf;
 #endif
     if (infile != 0) {                   /* If #include file     */
         infile->line = src_line;            /* Save current line    */
-#if MCPP_LIB
+#ifdef MCPP_LIB
         infile->last_fputc = mcpp_fputc;
         infile->last_fputs = mcpp_fputs;
         infile->last_fprintf = mcpp_fprintf;
diff --git a/TAO/TAO_IDL/contrib/mcpp/system.cpp b/TAO/TAO_IDL/contrib/mcpp/system.cpp
index 2341d4447b8..8eab5361e5c 100644
--- a/TAO/TAO_IDL/contrib/mcpp/system.cpp
+++ b/TAO/TAO_IDL/contrib/mcpp/system.cpp
@@ -365,7 +365,7 @@ static int      in_import;          /* #import rather than #include */
 static int      no_dir;
 #endif
 
-#if MCPP_LIB
+#ifdef MCPP_LIB
 void    init_system( void)
 /* Initialize static variables  */
 {
@@ -1368,7 +1368,7 @@ static void version( void)
 {
     const char *    mes[] = {
 
-#if     MCPP_LIB
+#ifdef     MCPP_LIB
 /* Write messages here, for example, "MySomeTool with ".    */
 #endif
 
@@ -1598,7 +1598,7 @@ static void usage(
     if (opt != '?')
         mcpp_fprintf( ERR, illegopt, opt, mcpp_optarg ? mcpp_optarg : null);
     version();
-#if MCPP_LIB
+#ifdef MCPP_LIB
     mes[ 1] = argv0;
 #endif
     while (*mpp)
@@ -2889,7 +2889,7 @@ void    put_depend(
     size_t          fnamlen;                /* Length of filename   */
 
     if (fp == 0) {   /* Main source file.  Have to initialize.   */
-#if MCPP_LIB
+#ifdef MCPP_LIB
         if (output != 0) {
             ACE_OS::free( output);
             ACE_OS::free( pos);
@@ -4838,7 +4838,7 @@ static int  mcpp_getopt(
     return  c;
 }
 
-#if ! HOST_HAVE_STPCPY
+#ifndef HOST_HAVE_STPCPY
 char *  stpcpy(
     char *          dest,
     const char *    src
@@ -4890,7 +4890,7 @@ void    at_end( void)
 #endif
 }
 
-#if MCPP_LIB
+#ifdef MCPP_LIB
 void    clear_filelist( void)
 /*
  * Free malloced memory for filename-list and directory-list.