You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2002/04/11 16:37:34 UTC
cvs commit: apr/threadproc/unix signals.c
trawick 02/04/11 07:37:34
Modified: . CHANGES
threadproc/unix signals.c
Log:
AIX: Fix breakage with 64-bit builds on versions of AIX prior
to 5L. The 64-bit definitions for sigset_t changed between
4.X and 5L.
PR: 7957
Revision Changes Path
1.256 +3 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- CHANGES 11 Apr 2002 01:05:39 -0000 1.255
+++ CHANGES 11 Apr 2002 14:37:33 -0000 1.256
@@ -1,5 +1,8 @@
Changes with APR b1
+ *) AIX: Fix breakage with 64-bit builds on versions of AIX prior
+ to 5L. PR 7957 [Jeff Trawick]
+
*) On socket write functions (apr_sendfile, apr_send, apr_sendv),
added a select to wait for writability on the socket if the
previous write was incomplete. [Jeff Trawick, Brian Pane]
1.43 +5 -4 apr/threadproc/unix/signals.c
Index: signals.c
===================================================================
RCS file: /home/cvs/apr/threadproc/unix/signals.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- signals.c 20 Mar 2002 21:47:55 -0000 1.42
+++ signals.c 11 Apr 2002 14:37:34 -0000 1.43
@@ -347,21 +347,22 @@
* off manually.
*
* Note that the private fields differ between 32-bit and 64-bit
- * and even between _ALL_SOURCE and !_ALL_SOURCE.
+ * and even between _ALL_SOURCE and !_ALL_SOURCE. Except that on
+ * AIX 4.3 32-bit builds and 64-bit builds use the same definition.
*
* Applicable AIX fixes such that this is no longer needed:
*
- * APAR IY23096 for AIX 51B, fix included in AIX 51C, and
+ * APAR IY23096 for AIX 51B, fix included in AIX 51C, and
* APAR IY24162 for 43X.
*/
#if defined(_AIX)
-#ifdef __64BIT__
+#if defined(__64BIT__) && defined(_AIXVERSION_510)
#ifdef _ALL_SOURCE
sig_mask.ss_set[3] &= 0x7FFFFFFF;
#else /* not _ALL_SOURCE */
sig_mask.__ss_set[3] &= 0x7FFFFFFF;
#endif
-#else /* not 64-bit build */
+#else /* not 64-bit build, or 64-bit build on 4.3 */
#ifdef _ALL_SOURCE
sig_mask.hisigs &= 0x7FFFFFFF;
#else /* not _ALL_SOURCE */