[Gnash] one fix for amd64 and something more

[Steffen Rusitschka]

hi,

below some patches for head. enjoy ;-) steffen

1. use size_t everywhere - elvis runs on amd64 (no sound - normal behaviour?)
Index: libbase/container.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/container.h,v
retrieving revision 1.1
diff -u -r1.1 container.h
--- libbase/container.h 20 Dec 2005 20:57:00 -0000      1.1
+++ libbase/container.h 11 Jan 2006 21:45:17 -0000
@@ -472,7 +472,7 @@
                assert(m_table);
                m_table->m_entry_count++;

-               unsigned int    hash_value = hash_functor()(key);
+               size_t  hash_value = hash_functor()(key);
                int     index = hash_value & m_table->m_size_mask;

                entry*  natural_entry = &(E(index));
@@ -643,7 +643,7 @@
                        : m_next_in_chain(e.m_next_in_chain), 
m_hash_value(e.m_hash_value), first(e.first), second(e.second)
                {
                }
-               entry(const T& key, const U& value, int next_in_chain, int 
hash_value)
+               entry(const T& key, const U& value, int next_in_chain, size_t 
hash_value)
                        : m_next_in_chain(next_in_chain), 
m_hash_value(hash_value), first(key), second(value)
                {
                }


2. fix for sdl and sdl-mixer headers being in different directories
Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- backend/Makefile.am 7 Jan 2006 04:44:09 -0000       1.3
+++ backend/Makefile.am 11 Jan 2006 21:45:15 -0000
@@ -36,6 +36,7 @@
         -I$(top_srcdir)/server  \
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/libgeometry \
+       $(SDL_CFLAGS)           \
         $(SDL_MIXER_CFLAGS)    \
        $(LIBXML_CFLAGS)        \
        $(OPENGL_CFLAGS)


3. remove two (un)signed warnings ...
Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.3
diff -u -r1.3 impl.cpp
--- server/impl.cpp     7 Jan 2006 04:44:09 -0000       1.3
+++ server/impl.cpp     11 Jan 2006 21:45:22 -0000
@@ -3276,7 +3276,7 @@
                                "onRollout",
                                "onRollover",
                        };
-                       for (int i = 0; i < ARRAYSIZE(FN_NAMES); i++) {
+                       for (unsigned int i = 0; i < ARRAYSIZE(FN_NAMES); i++) 
{
                                if (get_member(FN_NAMES[i], &dummy)) {
                                        return true;
                                }
@@ -3292,7 +3292,7 @@
                                event_id::DRAG_OVER,
                                event_id::DRAG_OUT,
                        };
-                       {for (int i = 0; i < ARRAYSIZE(EH_IDS); i++) {
+                       {for (unsigned int i = 0; i < ARRAYSIZE(EH_IDS); i++) 
{
                                if (get_event_handler(EH_IDS[i], &dummy)) {
                                        return true;
                                }



-- 
          Steffen Rusitschka

homepage: http://rusi.is-a-geek.org