[Gnash-commit] gnash ChangeLog configure.ac libbase/container.h

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/09/29 10:57:53

Modified files:
        .              : ChangeLog configure.ac 
        libbase        : container.h 

Log message:
        fixed HAVE_STRCASECMP collision.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.969&r2=1.970
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.117&r2=1.118
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/container.h?cvsroot=gnash&r1=1.39&r2=1.40

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.969
retrieving revision 1.970
diff -u -b -r1.969 -r1.970
--- ChangeLog   29 Sep 2006 10:35:11 -0000      1.969
+++ ChangeLog   29 Sep 2006 10:57:53 -0000      1.970
@@ -1,3 +1,7 @@
+2006-09-29 Markus Gothe <address@hidden>
+
+       * configure.ac, libbase/container.h: fixed HAVE_STRCASECMP collision.
+
 2006-09-29 Sandro Santilli  <address@hidden>
 
        * gui/Player.cpp: handle failures in movie loading.

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- configure.ac        27 Sep 2006 07:12:22 -0000      1.117
+++ configure.ac        29 Sep 2006 10:57:53 -0000      1.118
@@ -33,7 +33,7 @@
 dnl also makes it possible to release a modified version which carries
 dnl forward this exception.
 
-dnl $Id: configure.ac,v 1.117 2006/09/27 07:12:22 strk Exp $
+dnl $Id: configure.ac,v 1.118 2006/09/29 10:57:53 nihilus Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.7.1-cvs)
@@ -327,7 +327,7 @@
   char *p1 = (char *)"Hello";
   char *p2 = (char *)"World";
   strcasecmp(p1, p2); ],
-  AC_DEFINE(HAVE_STRCASECMP, [], [Has strcasecmp]),
+  AC_DEFINE(HAVE_STRINGCASECMP, [], [Has strcasecmp]),
   )
 
 dnl AC_CHECK_FUNCS(strcasecmp stricmp)

Index: libbase/container.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/container.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- libbase/container.h 18 Sep 2006 06:08:08 -0000      1.39
+++ libbase/container.h 29 Sep 2006 10:57:53 -0000      1.40
@@ -51,7 +51,7 @@
 # endif
 #endif
 
-#ifdef HAVE_STRCASECMP
+#ifdef HAVE_STRINGCASECMP
 # define STRCASECMP strcasecmp
 #else
 # define STRCASECMP _stricmp