[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog ./configure.ac libbase/Makefi...
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash ./ChangeLog ./configure.ac libbase/Makefi... |
Date: |
Thu, 02 Mar 2006 17:34:36 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 06/03/02 17:34:36
Modified files:
. : ChangeLog configure.ac
libbase : Makefile.am container.cpp container.h
utility.cpp
Added files:
macros : hashmap.m4
Removed files:
libbase : config.h
Log message:
* macros/hashmap.m4: New configure test for hash_map extension.
* configure.as: Look for hash_map extension. Check for vsnprintf,
strcasecmp, and stricmp.
* libbase/container.h: Include config.h. Use configure support to
define template.
* libbase/container.cpp: Include config.h. Use ifdefs based on
configure tests for vsnprintf, strcasecmp, and stricmp.
* libbase/utility.cpp: Don't build anything if dmalloc isn't
enabled.
* libbase/config.h: Remove as it doesn't appear to be used, and
conflicts with the autoconf generated one.
* libbase/Makefile.am: Include files from the src server directory
too, and the top level where config.h is. Don't include the
removed config.h in the header list.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.167&tr2=1.168&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/hashmap.m4?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/Makefile.am.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/container.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/container.h.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/utility.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.167 gnash/ChangeLog:1.168
--- gnash/ChangeLog:1.167 Wed Mar 1 00:54:43 2006
+++ gnash/ChangeLog Thu Mar 2 17:34:36 2006
@@ -1,3 +1,20 @@
+2006-03-02 Rob Savoye <address@hidden>
+
+ * macros/hashmap.m4: New configure test for hash_map extension.
+ * configure.as: Look for hash_map extension. Check for vsnprintf,
+ strcasecmp, and stricmp.
+ * libbase/container.h: Include config.h. Use configure support to
+ define template.
+ * libbase/container.cpp: Include config.h. Use ifdefs based on
+ configure tests for vsnprintf, strcasecmp, and stricmp.
+ * libbase/utility.cpp: Don't build anything if dmalloc isn't
+ enabled.
+ * libbase/config.h: Remove as it doesn't appear to be used, and
+ conflicts with the autoconf generated one.
+ * libbase/Makefile.am: Include files from the src server directory
+ too, and the top level where config.h is. Don't include the
+ removed config.h in the header list.
+
2006-02-28 Jim Garrison <address@hidden>
* server/MovieClipLoader.cpp, server/Sprite.cpp,
@@ -7,7 +24,8 @@
2006-02-28 Tomas Groth Christensen <address@hidden>
- * testsuite/actionscript.all/gen-test.sh: made the test-generator use
case-sensitivity, since MM flashplayer is casesensitive.
+ * testsuite/actionscript.all/gen-test.sh: made the test-generator
+ use case-sensitivity, since MM flashplayer is case sensitive.
2006-02-28 Rob Savoye <address@hidden>
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.42 gnash/configure.ac:1.43
--- gnash/configure.ac:1.42 Tue Feb 28 16:26:39 2006
+++ gnash/configure.ac Thu Mar 2 17:34:36 2006
@@ -151,7 +151,10 @@
AC_CHECK_LIB(rt, shm_unlink)
AC_CHECK_FUNCS(shm_open)
AC_CHECK_FUNCS(finite isfinite)
+AC_CHECK_FUNCS(strcasecmp stricmp)
+AC_CHECK_FUNCS(vsnprintf)
+GNASH_HASHMAP
dnl AC_CHECK_LIB(c, mremap)
GNASH_PATH_ZLIB
GNASH_PATH_JPEG
Index: gnash/libbase/Makefile.am
diff -u gnash/libbase/Makefile.am:1.13 gnash/libbase/Makefile.am:1.14
--- gnash/libbase/Makefile.am:1.13 Tue Feb 28 01:33:52 2006
+++ gnash/libbase/Makefile.am Thu Mar 2 17:34:36 2006
@@ -21,7 +21,6 @@
AM_CXXFLAGS = $(SDL_CFLAGS) $(SDL_MIXER_CFLAGS) $(INCLUDES)
AM_CPPFLAGS = -Wall
-# AM_LDFLAGS = $(OPENGL_LIBS) $(GLU_LIBS) $(SDL_LIBS)
# noinst_LTLIBRARIES = libbase.la
lib_LTLIBRARIES = libgnashbase.la
@@ -36,13 +35,13 @@
endif
INCLUDES = -I.. -I$(srcdir) \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/server \
$(PTHREAD_CFLAGS) \
$(PNG_CFLAGS) \
$(ZLIB_CFLAGS) \
$(JPEG_CFLAGS) \
- $(LIBXML_CFLAGS) \
- $(OPENGL_CFLAGS) \
- -I$(top_srcdir)
+ $(LIBXML_CFLAGS)
libgnashbase_la_SOURCES = \
config.cpp \
@@ -67,7 +66,6 @@
zlib_adapter.cpp
noinst_HEADERS = \
- config.h \
container.h \
demo.h \
dlmalloc.h \
Index: gnash/libbase/container.cpp
diff -u gnash/libbase/container.cpp:1.3 gnash/libbase/container.cpp:1.4
--- gnash/libbase/container.cpp:1.3 Sun Feb 26 15:49:29 2006
+++ gnash/libbase/container.cpp Thu Mar 2 17:34:36 2006
@@ -5,12 +5,14 @@
// Some non-inline implementation help for generic containers.
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
-#include "container.h"
+#include <stdarg.h>
#include "utf8.h"
#include "tu_random.h"
-#include <stdarg.h>
-
+#include "container.h"
void tu_string::append_wide_char(uint16 c)
{
@@ -170,10 +172,10 @@
/*static*/ int tu_string::stricmp(const char* a, const char* b)
{
-#ifdef _WIN32
- return ::stricmp(a, b);
-#else
+#ifdef HAVE_STRCASECMP
return strcasecmp(a, b);
+#else
+ return ::stricmp(a, b);
#endif
}
@@ -311,9 +313,9 @@
}
-#ifdef _WIN32
+#ifndef HAVE_VSNPRINTF
#define vsnprintf _vsnprintf
-#endif // _WIN32
+#endif
tu_string string_printf(const char* fmt, ...)
// Handy sprintf wrapper.
Index: gnash/libbase/container.h
diff -u gnash/libbase/container.h:1.8 gnash/libbase/container.h:1.9
--- gnash/libbase/container.h:1.8 Mon Feb 27 03:58:03 2006
+++ gnash/libbase/container.h Thu Mar 2 17:34:36 2006
@@ -1,16 +1,35 @@
-// container.h -- Thatcher Ulrich <address@hidden> 31 July 2001
-
-// This source code has been donated to the Public Domain. Do
-// whatever you want with it.
+//
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
-// Generic C++ containers. Problem: STL is murder on compile times,
-// and is hard to debug. These are substitutes that compile much
-// faster and are somewhat easier to debug. Not as featureful,
-// efficient or hammered-on as STL though. You can use STL
-// implementations if you want; see _TU_USE_STL.
+#ifndef __CONTAINER_H__
+#define __CONTAINER_H__
-#ifndef CONTAINER_H
-#define CONTAINER_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#if defined(GNU_HASH_MAP)
+# include <ext/hash_map>
+#else
+# ifdef WIN32_HASH_MAP
+# include <hash_map>
+# endif
+#endif
// FIXME: This ugly hack is for NetBSD, which seems to have a
// preprocessor problem, and won't define anything sensible like
@@ -27,7 +46,7 @@
clock_t clock __P((void));
size_t strftime __P((char *, size_t, const char *, const struct tm *));
-#include "tu_config.h"
+//#include "tu_config.h"
#include "utility.h"
#include <stdlib.h>
#include <cstring> // for strcmp and friends
@@ -72,25 +91,12 @@
//#define StlAlloc(size) malloc(size)
//#define StlFree(ptr, size) free(ptr)
-
-#ifdef _WIN32
-#include <hash_map>
template<class T, class U, class hash_functor = fixed_size_hash<T> >
-class hash : public stdext::hash_map<T, U, hash_functor>
-#else // ! _WIN32
-#include <ext/hash_map>
-template<class T, class U, class hash_functor = fixed_size_hash<T> >
-class hash : public __gnu_cxx::hash_map<T, U, hash_functor>
-#endif // ! _WIN32
+class hash : public HASH_MAP_NS::hash_map<T, U, hash_functor >
{
public:
-#ifdef _WIN32
- typedef typename stdext::hash_map<T, U, hash_functor>::const_iterator
const_iterator;
- typedef typename stdext::hash_map<T, U, hash_functor>::iterator
iterator;
-#else // ! _WIN32
- typedef typename __gnu_cxx::hash_map<T, U,
hash_functor>::const_iterator const_iterator;
- typedef typename __gnu_cxx::hash_map<T, U, hash_functor>::iterator
iterator;
-#endif // ! _WIN32
+ typedef typename HASH_MAP_NS::hash_map<T, U,
hash_functor>::const_iterator const_iterator;
+ typedef typename HASH_MAP_NS::hash_map<T, U, hash_functor>::iterator
iterator;
// extra convenience interfaces
void add(const T& key, const U& value)
@@ -152,9 +158,6 @@
#pragma warning(disable : 4345) // in MSVC 7.1, warning about placement
new POD default initializer
#endif // _WIN32
-
-
-
class tu_stringi;
// String-like type. Attempt to be memory-efficient with small strings.
@@ -557,11 +560,9 @@
;
-#endif // CONTAINER_H
+#endif // __CONTAINER_H__
// Local Variables:
// mode: C++
-// c-basic-offset: 8
-// tab-width: 8
// indent-tabs-mode: t
// End:
Index: gnash/libbase/utility.cpp
diff -u gnash/libbase/utility.cpp:1.3 gnash/libbase/utility.cpp:1.4
--- gnash/libbase/utility.cpp:1.3 Sun Feb 26 15:49:30 2006
+++ gnash/libbase/utility.cpp Thu Mar 2 17:34:36 2006
@@ -19,11 +19,10 @@
#include "config.h"
#endif
+#ifdef HAVE_DMALLOC
#include "utility.h"
#include "dlmalloc.h"
-#ifdef HAVE_DMALLOC
-
// Overrides of new/delete that use Doug Lea's malloc. Very helpful
// on certain lame platforms.
@@ -57,6 +56,7 @@
// This does not work with DMALLOC, since the internal data structures
// differ.
+#ifdef HAVE_DMALLOC
#ifdef HAVE_MALLINFO
struct mallinfo mi;
@@ -85,8 +85,8 @@
// allocated = mi.uordblks;
//}
-// HAVE_MALLINFO
-#endif
+#endif // HAVE_DMALLOC
+#endif // HAVE_MALLINFO
}
// Local Variables:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./ChangeLog ./configure.ac libbase/Makefi...,
Rob Savoye <=