[cvslog] [CVS] Module eggdrop1.6: Change committed

cvs at eggheads.org cvs at eggheads.org
Sun Oct 2 11:34:44 CST 2011


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2011-10-02 17:34:44 UTC
Committer  : Rumen Stoyanov <pseudo at egg6.net>

Modified files:
     aclocal.m4 configure doc/Changes1.6 src/patch.h

Log message:

Removed -mwin32 on Windows. It's no longer necessary and causes problems with Cygwin 1.7.

---------------------- diff included ----------------------
Index: eggdrop1.6/aclocal.m4
diff -u eggdrop1.6/aclocal.m4:1.122 eggdrop1.6/aclocal.m4:1.123
--- eggdrop1.6/aclocal.m4:1.122	Fri Sep 23 14:31:32 2011
+++ eggdrop1.6/aclocal.m4	Sun Oct  2 11:34:33 2011
@@ -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.122 2011/09/23 20:31:32 thommey Exp $
+dnl $Id: aclocal.m4,v 1.123 2011/10/02 17:34:33 pseudo Exp $
 dnl
 
 
@@ -667,9 +667,7 @@
       esac
     ;;
     CYGWI*)
-      AC_PROG_CC_WIN32
       SHLIB_LD="$CC -shared"
-      CC="$CC $WIN32FLAGS"
       MOD_CC="$CC"
       MOD_LD="$CC"
       EGG_CYGWIN="yes"
@@ -1766,42 +1764,3 @@
   AC_SUBST(egg_ac_parameters)
   AC_DEFINE_UNQUOTED(EGG_AC_ARGS, "$egg_ac_parameters", [Arguments passed to configure])
 ])
-
-
-dnl AC_PROG_CC_WIN32()
-dnl
-AC_DEFUN([AC_PROG_CC_WIN32],
-[
-  AC_MSG_CHECKING([how to access the Win32 API])
-  WIN32FLAGS=
-  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-    #ifndef WIN32
-    #  ifndef _WIN32
-    #    error WIN32 or _WIN32 not defined
-    #  endif
-    #endif
-  ]])], [
-    AC_MSG_RESULT([present by default])
-  ], [
-    ac_compile_save="$ac_compile"
-    save_CC="$CC"
-    ac_compile="$ac_compile -mwin32"
-    CC="$CC -mwin32"
-    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-      #ifndef WIN32
-      #  ifndef _WIN32
-      #    error WIN32 or _WIN32 not defined
-      #  endif
-      #endif
-    ]])], [
-      AC_MSG_RESULT([found via -mwin32])
-      ac_compile="$ac_compile_save"
-      CC="$save_CC"
-      WIN32FLAGS="-mwin32"
-    ], [
-      ac_compile="$ac_compile_save"
-      CC="$save_CC"
-      AC_MSG_RESULT([not found])
-    ])
-  ])
-])
Index: eggdrop1.6/configure
diff -u eggdrop1.6/configure:1.171 eggdrop1.6/configure:1.172
--- eggdrop1.6/configure:1.171	Fri Sep 23 14:31:32 2011
+++ eggdrop1.6/configure	Sun Oct  2 11:34:33 2011
@@ -5402,64 +5402,7 @@
       esac
     ;;
     CYGWI*)
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to access the Win32 API" >&5
-$as_echo_n "checking how to access the Win32 API... " >&6; }
-  WIN32FLAGS=
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-    #ifndef WIN32
-    #  ifndef _WIN32
-    #    error WIN32 or _WIN32 not defined
-    #  endif
-    #endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: present by default" >&5
-$as_echo "present by default" >&6; }
-
-else
-
-    ac_compile_save="$ac_compile"
-    save_CC="$CC"
-    ac_compile="$ac_compile -mwin32"
-    CC="$CC -mwin32"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-      #ifndef WIN32
-      #  ifndef _WIN32
-      #    error WIN32 or _WIN32 not defined
-      #  endif
-      #endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found via -mwin32" >&5
-$as_echo "found via -mwin32" >&6; }
-      ac_compile="$ac_compile_save"
-      CC="$save_CC"
-      WIN32FLAGS="-mwin32"
-
-else
-
-      ac_compile="$ac_compile_save"
-      CC="$save_CC"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
       SHLIB_LD="$CC -shared"
-      CC="$CC $WIN32FLAGS"
       MOD_CC="$CC"
       MOD_LD="$CC"
       EGG_CYGWIN="yes"
Index: eggdrop1.6/doc/Changes1.6
diff -u eggdrop1.6/doc/Changes1.6:1.111 eggdrop1.6/doc/Changes1.6:1.112
--- eggdrop1.6/doc/Changes1.6:1.111	Fri Sep 23 14:31:32 2011
+++ eggdrop1.6/doc/Changes1.6	Sun Oct  2 11:34:33 2011
@@ -1,4 +1,4 @@
-$Id: Changes1.6,v 1.111 2011/09/23 20:31:32 thommey Exp $
+$Id: Changes1.6,v 1.112 2011/10/02 17:34:33 pseudo Exp $
 
 Eggdrop Changes (since version 1.6.0)
 
@@ -6,6 +6,10 @@
 
 1.6.21 (CVS):
 
+  - Removed -mwin32 on Windows. It's no longer necessary and causes problems
+    with Cygwin 1.7.
+    Patch by: Kirben, pseudo
+
   - Moved variable declarations to conform to C89 (beginning of blocks only).
     Found by: Anon-e-mouse / Patch by: thommey
 
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1265 eggdrop1.6/src/patch.h:1.1266
--- eggdrop1.6/src/patch.h:1.1265	Fri Sep  9 15:37:53 2011
+++ eggdrop1.6/src/patch.h	Sun Oct  2 11:34:33 2011
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1265 2011/09/09 21:37:53 thommey Exp $
+ * $Id: patch.h,v 1.1266 2011/10/02 17:34:33 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1315604253");            /* current unixtime */
+patch("1317576601");            /* current unixtime */
 /*
  *
  *
  */
-patch("threadloopreturn");
+patch("w32");
 /*
  *
  *
----------------------- End of diff -----------------------


More information about the Changes mailing list