[cvslog] (2004-04-10 04:53:52 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Fri Apr 9 22:53:52 CST 2004


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2004-04-10 04:53:52 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     aclocal.m4 configure doc/UPDATES1.6 src/net.c src/patch.h

Log message:

* More HP stuff.

---------------------- diff included ----------------------
Index: eggdrop1.6/aclocal.m4
diff -u eggdrop1.6/aclocal.m4:1.86 eggdrop1.6/aclocal.m4:1.87
--- eggdrop1.6/aclocal.m4:1.86	Sat Jan 17 21:57:26 2004
+++ eggdrop1.6/aclocal.m4	Fri Apr  9 23:53:41 2004
@@ -16,7 +16,7 @@
 dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 dnl
-dnl $Id: aclocal.m4,v 1.86 2004/01/18 03:57:26 wcc Exp $
+dnl $Id: aclocal.m4,v 1.87 2004/04/10 04:53:41 wcc Exp $
 dnl
 
 dnl EGG_MSG_CONFIGURE_START()
@@ -279,14 +279,20 @@
     ;;
     HP-UX)
       HPUX="yes"
-      MOD_LD="$CC -fPIC -shared"
-      SHLIB_CC="$CC -fPIC"
+      if test "$CC" = "cc"; then
+        # HP-UX ANSI C Compiler.
+        MOD_LD="$CC +z"
+        SHLIB_CC="$CC +z"
+        AC_DEFINE(MODULES_OK, 1, [Define if modules will work on your system.])
+      else
+        # GCC
+        MOD_LD="$CC -fPIC -shared"
+        SHLIB_CC="$CC -fPIC"
+      fi
       SHLIB_LD="ld -b"
       NEED_DL=0
-      AC_DEFINE(MODULES_OK, 1, [Define if modules will work on your system.])
       AC_DEFINE(HPUX_HACKS, 1, [Define if running on HPUX that supports dynamic linking.])
-      if test "`echo $egg_cv_var_system_release | cut -d . -f 2`" = "10"
-      then
+      if test "`echo $egg_cv_var_system_release | cut -d . -f 2`" = "10"; then
         AC_DEFINE(HPUX10_HACKS, 1, [Define if running on HPUX 10.x.])
       fi
     ;;
Index: eggdrop1.6/configure
diff -u eggdrop1.6/configure:1.115 eggdrop1.6/configure:1.116
--- eggdrop1.6/configure:1.115	Thu Apr  8 23:18:07 2004
+++ eggdrop1.6/configure	Fri Apr  9 23:53:41 2004
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.4 .
+# From configure.ac Revision: 1.5 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for Eggdrop 1.6.16.
 #
@@ -3860,22 +3860,28 @@
     ;;
     HP-UX)
       HPUX="yes"
-      MOD_LD="$CC -fPIC -shared"
-      SHLIB_CC="$CC -fPIC"
-      SHLIB_LD="ld -b"
-      NEED_DL=0
+      if test "$CC" = "cc"; then
+        # HP-UX ANSI C Compiler.
+        MOD_LD="$CC +z"
+        SHLIB_CC="$CC +z"
 
 cat >>confdefs.h <<\_ACEOF
 #define MODULES_OK 1
 _ACEOF
 
+      else
+        # GCC
+        MOD_LD="$CC -fPIC -shared"
+        SHLIB_CC="$CC -fPIC"
+      fi
+      SHLIB_LD="ld -b"
+      NEED_DL=0
 
 cat >>confdefs.h <<\_ACEOF
 #define HPUX_HACKS 1
 _ACEOF
 
-      if test "`echo $egg_cv_var_system_release | cut -d . -f 2`" = "10"
-      then
+      if test "`echo $egg_cv_var_system_release | cut -d . -f 2`" = "10"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HPUX10_HACKS 1
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.550 eggdrop1.6/doc/UPDATES1.6:1.551
--- eggdrop1.6/doc/UPDATES1.6:1.550	Fri Apr  9 13:00:31 2004
+++ eggdrop1.6/doc/UPDATES1.6	Fri Apr  9 23:53:42 2004
@@ -1,4 +1,4 @@
-$Id: UPDATES1.6,v 1.550 2004/04/09 18:00:31 wcc Exp $
+$Id: UPDATES1.6,v 1.551 2004/04/10 04:53:42 wcc Exp $
 
 Eggdrop Changes (since v1.6.0)
      _________________________________________________________________
@@ -11,6 +11,13 @@
     ftp://ftp.eggheads.org/pub/eggdrop/UPDATES/
 
   1.6.16:
+    - More HP ANSI C fixes.
+    * Patch by: Wcc
+
+    - Fixed a few warnings. We also should compile correctly with HP's ANSI C
+      compiler now.
+    * Patch by: stdarg
+
     + RC1 released on April 9th, 2004.
 
     - Missing \n on language entry in notes.mod.
Index: eggdrop1.6/src/net.c
diff -u eggdrop1.6/src/net.c:1.65 eggdrop1.6/src/net.c:1.66
--- eggdrop1.6/src/net.c:1.65	Fri Apr  9 22:52:28 2004
+++ eggdrop1.6/src/net.c	Fri Apr  9 23:53:42 2004
@@ -2,7 +2,7 @@
  * net.c -- handles:
  *   all raw network i/o
  *
- * $Id: net.c,v 1.65 2004/04/10 03:52:28 stdarg Exp $
+ * $Id: net.c,v 1.66 2004/04/10 04:53:42 wcc Exp $
  */
 /*
  * This is hereby released into the public domain.
@@ -670,8 +670,6 @@
                                   * otherwise it will connect. */
             *len = socklist[i].sock;
             socklist[i].flags &= ~SOCK_CONNECT;
-	    putlog(LOG_MISC, "*", "socklist[i].inbuflen = %d", socklist[i].inbuflen);
-	    if (socklist[i].inbuf) putlog(LOG_MISC, "*", "inbuf = '%s'", socklist[i].inbuf);
             debug1("net: eof!(read) socket %d", socklist[i].sock);
             return -1;
           } else {
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1068 eggdrop1.6/src/patch.h:1.1069
--- eggdrop1.6/src/patch.h:1.1068	Fri Apr  9 13:00:31 2004
+++ eggdrop1.6/src/patch.h	Fri Apr  9 23:53:42 2004
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1068 2004/04/09 18:00:31 wcc Exp $
+ * $Id: patch.h,v 1.1069 2004/04/10 04:53:42 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1081533616");            /* current unixtime */
+patch("1081572565");            /* current unixtime */
 /*
  *
  *
  */
-patch("noteslang");
+patch("hpux");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list