diff options
Diffstat (limited to 'examples/APG/Logging/Wrap_Macros.cpp')
| -rw-r--r-- | examples/APG/Logging/Wrap_Macros.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/examples/APG/Logging/Wrap_Macros.cpp b/examples/APG/Logging/Wrap_Macros.cpp index 73c908272d2..9e88d3e11e0 100644 --- a/examples/APG/Logging/Wrap_Macros.cpp +++ b/examples/APG/Logging/Wrap_Macros.cpp @@ -1,16 +1,18 @@ // $Id$ -#if defined (__GNUC__) && (__GNUC__ >= 3 || __GNUC_MINOR__ > 95) +#include "Trace.h" + +#if defined (__GNUC__) && (__GNUC__ >= 3 || __GNUC_MINOR__ > 95) && \ + (!defined (VXWORKS) || !(__GNUC__ == 2 && __GNUC_MINOR__ == 96)) // The macros in Trace.h only work on g++ 2.96 and later. +// But not with VxWorks g++ 2.96. // Listing 1 code/ch03 -#include "Trace.h" - void foo (void); int ACE_TMAIN (int, ACE_TCHAR *[]) { - ACE_TRACE (ACE_TEXT ("main")); + ACE_TRACE ("main"); MY_DEBUG (ACE_TEXT ("Hi Mom\n")); foo (); MY_DEBUG (ACE_TEXT ("Goodnight\n")); @@ -19,7 +21,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) void foo (void) { - ACE_TRACE (ACE_TEXT ("foo")); + ACE_TRACE ("foo"); MY_DEBUG (ACE_TEXT ("Howdy Pardner\n")); } // Listing 1 @@ -27,7 +29,7 @@ void foo (void) #else #include <stdio.h> -int main (int, char *[]) +int ACE_TMAIN (int, ACE_TCHAR *[]) { puts ("This example only works on g++ 2.96 and later.\n"); return 0; |