Many changes to the printing classes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/unix/threadpsx.cpp

@@ -24,12 +24,13 @@
     #pragma implementation "thread.h"
 #endif
 
+// With simple makefiles, we must ignore the file body if not using
+// threads.
+#include "wx/setup.h"
+
+#if wxUSE_THREADS
+
 #include "wx/thread.h"
-
-#if !wxUSE_THREADS
-    #error This file needs wxUSE_THREADS
-#endif
-
 #include "wx/module.h"
 #include "wx/utils.h"
 #include "wx/log.h"
@@ -42,7 +43,7 @@
 #include <errno.h>
 #include <time.h>
 
-#ifdef HAVE_SCHED_H
+#if HAVE_SCHED_H
     #include <sched.h>
 #endif
 
@@ -793,3 +794,5 @@ void wxMutexGuiLeave()
   gs_mutexGui->Unlock();
 }
 
+#endif
+  // wxUSE_THREADS

src/unix/utilsunx.cpp

@@ -41,7 +41,10 @@
 #include <time.h>           // nanosleep() and/or usleep()
 #include <ctype.h>          // isspace()
 
-#ifdef HAVE_UNAME
+// JACS: needed for FD_SETSIZE
+#include <sys/time.h>
+
+#if HAVE_UNAME
     #include <sys/utsname.h> // for uname()
 #endif // HAVE_UNAME
 
@@ -81,14 +84,14 @@ void wxSleep(int nSecs)
 
 void wxUsleep(unsigned long milliseconds)
 {
-#if defined(HAVE_NANOSLEEP)
+#if HAVE_NANOSLEEP
     timespec tmReq;
     tmReq.tv_sec = milliseconds / 1000;
     tmReq.tv_nsec = (milliseconds % 1000) * 1000 * 1000;
 
     // we're not interested in remaining time nor in return value
     (void)nanosleep(&tmReq, (timespec *)NULL);
-#elif defined(HAVE_USLEEP)
+#elif HAVE_USLEEP
     // uncomment this if you feel brave or if you are sure that your version
     // of Solaris has a safe usleep() function but please notice that usleep()
     // is known to lead to crashes in MT programs in Solaris 2.[67] and is not