Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_12_branch
Commit time: 2005-12-14 03:01:48 UTC
Modified files:
Tag: u2_10_12_branch
ChangeLog configure.in ircd/ircd_crypt_native.c ircd/os_generic.c
Log message:
Fix build on Solaris 10.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.710.2.46 ircu2.10/ChangeLog:1.710.2.47
--- ircu2.10/ChangeLog:1.710.2.46 Tue Dec 13 15:45:55 2005
+++ ircu2.10/ChangeLog Tue Dec 13 19:01:36 2005
@@ -1,5 +1,15 @@
2005-12-13 Michael Poole <[EMAIL PROTECTED]>
+ * configure.in: Define a macro when compiling on Solaris.
+
+ * ircd/ircd_crypt_native.c (_XOPEN_SOURCE): Turn down to 500 so
+ that Solaris doesn't complain that SUSv3 requires C99.
+
+ * ircd/os_generic.c (_XOPEN_SOURCE): Likewise, but leave it at 600
+ on non-Solaris platforms so that IPv6 stays supported.
+
+2005-12-13 Michael Poole <[EMAIL PROTECTED]>
+
* ircd/m_join.c (ms_join): Prevent net rides allowed by moving the
channel timestamp backwards in time without deopping current ops.
(Reported by Wouter Coekaerts.)
Index: ircu2.10/configure.in
diff -u ircu2.10/configure.in:1.34 ircu2.10/configure.in:1.34.2.1
--- ircu2.10/configure.in:1.34 Sat Jul 16 17:18:58 2005
+++ ircu2.10/configure.in Tue Dec 13 19:01:38 2005
@@ -19,7 +19,7 @@
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
dnl
-dnl $Id: configure.in,v 1.34 2005/07/17 00:18:58 entrope Exp $
+dnl $Id: configure.in,v 1.34.2.1 2005/12/14 03:01:38 entrope Exp $
dnl Make sure we are in the correct directory (someone could have run
dnl 'configure' with a wrong '--srcdir').
@@ -171,6 +171,7 @@
else
unet_poll_syscall=no
fi
+ AC_DEFINE([IRCU_SOLARIS], 1, [Define if building on Solaris])
;;
*-sunos*)
Index: ircu2.10/ircd/ircd_crypt_native.c
diff -u ircu2.10/ircd/ircd_crypt_native.c:1.7
ircu2.10/ircd/ircd_crypt_native.c:1.7.2.1
--- ircu2.10/ircd/ircd_crypt_native.c:1.7 Thu May 12 19:03:33 2005
+++ ircu2.10/ircd/ircd_crypt_native.c Tue Dec 13 19:01:38 2005
@@ -19,13 +19,13 @@
/**
* @file
* @brief Native crypt() function routines
- * @version $Id: ircd_crypt_native.c,v 1.7 2005/05/13 02:03:33 entrope Exp $
+ * @version $Id: ircd_crypt_native.c,v 1.7.2.1 2005/12/14 03:01:38 entrope Exp
$
*
* Routines for handling passwords encrypted with the system's native crypt()
* function (typically a DES encryption routine, but can be anything nowadays).
*
*/
-#define _XOPEN_SOURCE 600
+#define _XOPEN_SOURCE 500
#include "config.h"
#include "ircd_crypt.h"
Index: ircu2.10/ircd/os_generic.c
diff -u ircu2.10/ircd/os_generic.c:1.23.2.1 ircu2.10/ircd/os_generic.c:1.23.2.2
--- ircu2.10/ircd/os_generic.c:1.23.2.1 Tue Oct 11 18:48:33 2005
+++ ircu2.10/ircd/os_generic.c Tue Dec 13 19:01:38 2005
@@ -18,12 +18,24 @@
*/
/** @file
* @brief Implementation of OS-dependent operations.
- * @version $Id: os_generic.c,v 1.23.2.1 2005/10/12 01:48:33 entrope Exp $
+ * @version $Id: os_generic.c,v 1.23.2.2 2005/12/14 03:01:38 entrope Exp $
*/
#include "config.h"
-#define _XOPEN_SOURCE 600 /**< make limits.h #define IOV_MAX */
-#define __EXTENSIONS__ 1 /**< make Solaris netinet/in.h know IPv6 */
+#ifdef IRCU_SOLARIS
+/* Solaris requires C99 support for SUSv3, but C99 support breaks other
+ * parts of the build. So fall back to SUSv2, but request IPv6 support
+ * by defining __EXTENSIONS__.
+ */
+#define _XOPEN_SOURCE 500
+#define __EXTENSIONS__ 1
+#else
+/* FreeBSD 6.0 requires SUSv3 to support IPv6. Apparently some other
+ * OS requires SUSv3 to define IOV_MAX, but its identity is lost for
+ * the time being.
+ */
+#define _XOPEN_SOURCE 600
+#endif
#include "ircd_osdep.h"
#include "msgq.h"
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
