svn commit: r594742 - in /logging/log4cxx/trunk/src: examples/cpp/console.cpp examples/cpp/delayedloop.cpp simplesocketserver/cpp/simplesocketserver.cpp

[carnold]

Author: carnold
Date: Tue Nov 13 19:24:15 2007
New Revision: 594742

URL: http://svn.apache.org/viewvc?rev=594742&view=rev
Log:
LOGCXX-75: Other missing #if's for cygwin

Modified:
    logging/log4cxx/trunk/src/examples/cpp/console.cpp
    logging/log4cxx/trunk/src/examples/cpp/delayedloop.cpp
    logging/log4cxx/trunk/src/simplesocketserver/cpp/simplesocketserver.cpp

Modified: logging/log4cxx/trunk/src/examples/cpp/console.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/examples/cpp/console.cpp?rev=594742&r1=594741&r2=594742&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/examples/cpp/console.cpp (original)
+++ logging/log4cxx/trunk/src/examples/cpp/console.cpp Tue Nov 13 19:24:15 2007
@@ -63,9 +63,11 @@
         if (strcmp("-err", argv[i]) == 0) {
             err = true;
         } else if (strcmp("puts", argv[i]) == 0) {
-            fputs("Hello, fputs\n", err ? stderr : stdout);
+            fputs("Hello, fputs\n", err ? stderr : stdout);
+#if LOG4CXX_HAS_WCHAR_T
         } else if (strcmp("putws", argv[i]) == 0) {
-            fputws(L"Hello, fputws\n", err ? stderr : stdout);
+            fputws(L"Hello, fputws\n", err ? stderr : stdout);
+#endif
         } else if (strcmp("cout", argv[i]) == 0) {
             if (err) {
                 std::cerr << "Hello, cout" << std::endl;
@@ -95,10 +97,12 @@
                 configured = true;
             }
             log4cxx::Logger::getRootLogger()->info("Hello, log4cxx");
+#if LOG4CXX_HAS_WCHAR_T
         } else if (strcmp("wide", argv[i]) == 0) {
             fwide(err ? stderr : stdout, 1);
         } else if (strcmp("byte", argv[i]) == 0) {
-            fwide(err ? stderr : stdout, -1);
+            fwide(err ? stderr : stdout, -1);
+#endif
         } else {
             fputs("Unrecognized option: ", stderr);
             fputs(argv[i], stderr);

Modified: logging/log4cxx/trunk/src/examples/cpp/delayedloop.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/examples/cpp/delayedloop.cpp?rev=594742&r1=594741&r2=594742&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/examples/cpp/delayedloop.cpp (original)
+++ logging/log4cxx/trunk/src/examples/cpp/delayedloop.cpp Tue Nov 13 19:24:15 
2007
@@ -28,6 +28,7 @@
 using namespace log4cxx;
 using namespace log4cxx::helpers;
 
+
 /**
 This test program sits in a loop and logs things. Its logging is
 configured by a configuration file. Changes to this configuration
@@ -66,11 +67,19 @@
                 if(configFile.length() > 4 &&
                      configFile.substr(configFile.length() - 4) == ".xml")
                 {
-                        xml::DOMConfigurator::configureAndWatch(configFile, 
3000);
+#if APR_HAS_THREADS
+                                       
xml::DOMConfigurator::configureAndWatch(configFile, 3000);
+#else
+                                       
xml::DOMConfigurator::configure(configFile);
+#endif
                 }
                 else
                 {
+#if APR_HAS_THREADS
                         PropertyConfigurator::configureAndWatch(configFile, 
3000);
+#else
+                        PropertyConfigurator::configure(configFile);
+#endif
                 }
         }
 

Modified: 
logging/log4cxx/trunk/src/simplesocketserver/cpp/simplesocketserver.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/simplesocketserver/cpp/simplesocketserver.cpp?rev=594742&r1=594741&r2=594742&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/simplesocketserver/cpp/simplesocketserver.cpp 
(original)
+++ logging/log4cxx/trunk/src/simplesocketserver/cpp/simplesocketserver.cpp Tue 
Nov 13 19:24:15 2007
@@ -72,6 +72,7 @@
 int main(int argc, const char * const argv[])
 {
         apr_app_initialize(&argc, &argv, NULL);
+#if APR_HAS_THREADS
         if(argc == 3)
         {
                 init(argv[1], argv[2]);
@@ -111,7 +112,9 @@
         {
                 std::cout << "SocketException: " << e.what() << std::endl;
         }
-
+#else
+               std::cout << "simplesocketserver requires APR threads";
+#endif
         apr_terminate();
         return 0;
 }