diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-06-09 22:05:08 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-06-09 22:05:08 +0000 |
| commit | 18c7ea6c6dbfbc0a146ddaedeb4bc108c11e7565 (patch) | |
| tree | 5fdd1124d51448c5a758856c64eca2769dec4072 | |
| parent | ff2c5bd7ed9f9da59e349c3f5eb7577b430b3b6a (diff) | |
| download | ATCD-18c7ea6c6dbfbc0a146ddaedeb4bc108c11e7565.tar.gz | |
Tue Jun 9 22:04:49 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/TAO_IDL/contrib/mcpp/internal.H | 8 | ||||
| -rw-r--r-- | TAO/TAO_IDL/contrib/mcpp/lib.cpp | 2 | ||||
| -rw-r--r-- | TAO/TAO_IDL/contrib/mcpp/system.cpp | 5 |
4 files changed, 17 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 40c5d341467..17e5f21759d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Tue Jun 9 22:04:49 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> + + * TAO_IDL/contrib/mcpp/internal.H: + * TAO_IDL/contrib/mcpp/lib.cpp: + * TAO_IDL/contrib/mcpp/system.cpp: + + Compile warning fixes. + Tue Jun 9 21:01:30 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> * TAO_IDL/contrib/mcpp/directive.cpp: @@ -13,7 +21,7 @@ Tue Jun 9 21:01:30 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> * TAO_IDL/contrib/mcpp/system.cpp: Compile warning fixes. - + Tue Jun 9 20:25:50 UTC 2009 Adam Mitz <mitza@ociweb.com> * bin/tao_orb_tests.lst: diff --git a/TAO/TAO_IDL/contrib/mcpp/internal.H b/TAO/TAO_IDL/contrib/mcpp/internal.H index 52757f08a02..50d80097fc1 100644 --- a/TAO/TAO_IDL/contrib/mcpp/internal.H +++ b/TAO/TAO_IDL/contrib/mcpp/internal.H @@ -530,7 +530,7 @@ extern void at_end( void); /* Do the final commands */ extern void print_heap( void); /* Print blocks of heap memory */ -#ifndef HOST_HAVE_STPCPY +#if defined(HOST_HAVE_STPCPY) && HOST_HAVE_STPCPY == FALSE extern char * stpcpy( char * dest, const char * src); /* Non-Standard library function*/ #endif @@ -557,6 +557,6 @@ extern void init_system( void); #endif #endif -#ifndef HOST_HAVE_STPCPY -extern char * stpcpy( char * dest, const char * src); -#endif +///#if defined(HOST_HAVE_STPCPY) && HOST_HAVE_STPCPY == FALSE +//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 62cc920fada..edef3257b05 100644 --- a/TAO/TAO_IDL/contrib/mcpp/lib.cpp +++ b/TAO/TAO_IDL/contrib/mcpp/lib.cpp @@ -109,7 +109,7 @@ int getopt( #endif -#if ! HOST_HAVE_STPCPY +#if defined(HOST_HAVE_STPCPY) && HOST_HAVE_STPCPY == FALSE char * mcpp_stpcpy( char * dest, diff --git a/TAO/TAO_IDL/contrib/mcpp/system.cpp b/TAO/TAO_IDL/contrib/mcpp/system.cpp index 4b08cae98e9..1d458aa453c 100644 --- a/TAO/TAO_IDL/contrib/mcpp/system.cpp +++ b/TAO/TAO_IDL/contrib/mcpp/system.cpp @@ -44,6 +44,7 @@ #endif #include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_sys_stat.h" #if HOST_SYS_FAMILY == SYS_UNIX #include "ace/OS_NS_unistd.h" /* For getcwd(), readlink() */ @@ -2455,7 +2456,7 @@ static char * norm_path( #if HOST_COMPILER == MSC struct _stat st_buf; #else - struct stat st_buf; + ACE_stat st_buf; #endif if (! dir || (*dir && is_full_path( fname))) @@ -4838,7 +4839,7 @@ void do_pragma( void) return c; } -#ifndef HOST_HAVE_STPCPY +#if defined(HOST_HAVE_STPCPY) && HOST_HAVE_STPCPY == FALSE char * stpcpy( char * dest, const char * src |