OSSP CVS Repository

ossp - Check-in [4702]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 4702
Date: 2004-Sep-12 13:36:13 (local)
2004-Sep-12 11:36:13 (UTC)
User:rse
Branch:
Comment: Avoid side-effects by defining _XOPEN_SOURCE only temporarily for inclusion of <poll.h> instead of permanently.

Submitted by: Graham Nash <gnash@ncube.com>

Tickets:
Inspections:
Files:
ossp-pkg/pth/ChangeLog      1.617 -> 1.618     4 inserted, 0 deleted
ossp-pkg/pth/THANKS      1.94 -> 1.95     1 inserted, 0 deleted
ossp-pkg/pth/pth.h.in      1.141 -> 1.142     7 inserted, 0 deleted

ossp-pkg/pth/ChangeLog 1.617 -> 1.618

--- ChangeLog    2004/09/12 11:27:32     1.617
+++ ChangeLog    2004/09/12 11:36:13     1.618
@@ -21,6 +21,10 @@
                   
   Changes between 2.0.1 and 2.0.2 (13-Jul-2003 to xx-XXX-2004)
 
+   *) Avoid side-effects by defining _XOPEN_SOURCE only temporarily
+      for inclusion of <poll.h> instead of permanently.
+      [Graham Nash <gnash@ncube.com>]
+
    *) Workaround GCC 2.x and 3.5 (3.4 worked fine) macro parsing
       behaviour by using a pre-declared function pointer type "typedef
       int (*pth_event_func_t)(void *);" instead of using an inlined 


ossp-pkg/pth/THANKS 1.94 -> 1.95

--- THANKS       2004/09/12 11:28:03     1.94
+++ THANKS       2004/09/12 11:36:13     1.95
@@ -75,6 +75,7 @@
     o  Aaron Metzger               <ametzger@varcom.com>
     o  Igor A. Minyukoff           <iam@inser.loniis.spb.su>
     o  Matthew Mondor              <mmondor@gobot.ca>
+    o  Graham Nash                 <gnash@ncube.com>
     o  Eric Newton                 <ecn@smart.net>
     o  Sami Niemi                  <saminiemi@usa.net>
     o  Joseph Wayne Norton         <norton@alum.mit.edu>


ossp-pkg/pth/pth.h.in 1.141 -> 1.142

--- pth.h.in     2004/07/13 10:50:49     1.141
+++ pth.h.in     2004/09/12 11:36:13     1.142
@@ -338,8 +338,15 @@
 #define PTH_FAKE_POLL @PTH_FAKE_POLL@
 #if !(PTH_FAKE_POLL)
 /* use vendor poll(2) environment */
+#ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE
+#define _XOPEN_SOURCE_set
+#endif
 #include <poll.h>
+#ifdef _XOPEN_SOURCE_set
+#undef _XOPEN_SOURCE_set
+#undef _XOPEN_SOURCE
+#endif
 #ifndef POLLRDNORM
 #define POLLRDNORM POLLIN
 #endif

CVSTrac 2.0.1