[Gnash-commit] gnash backend/Makefile.am libbase/container.h s...

[strk]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     strk <address@hidden>   06/01/12 10:28:12

Modified files:
        backend        : Makefile.am 
        libbase        : container.h 
        server         : impl.cpp 

Log message:
        Applied patches by Steffen Rusitschka:
        1. use size_t everywhere - elvis runs on amd64
        2. fix for sdl and sdl-mixer headers being in different directories
        3. remove two (un)signed warnings ...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/Makefile.am.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.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/impl.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnash/backend/Makefile.am
diff -u gnash/backend/Makefile.am:1.3 gnash/backend/Makefile.am:1.4
--- gnash/backend/Makefile.am:1.3       Sat Jan  7 04:44:09 2006
+++ gnash/backend/Makefile.am   Thu Jan 12 10:28:12 2006
@@ -28,6 +28,7 @@
        $(PNG_LIBS)         \
         $(LIBXML_LIBS)     \
         $(SDL_LIBS)         \
+        $(SDL_CFLAGS)   \
         $(SDL_MIXER_LIBS)   \
         $(OPENGL_LIBS)
 
Index: gnash/libbase/container.h
diff -u gnash/libbase/container.h:1.1 gnash/libbase/container.h:1.2
--- gnash/libbase/container.h:1.1       Tue Dec 20 20:57:00 2005
+++ gnash/libbase/container.h   Thu Jan 12 10:28:12 2006
@@ -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)
                {
                }
Index: gnash/server/impl.cpp
diff -u gnash/server/impl.cpp:1.3 gnash/server/impl.cpp:1.4
--- gnash/server/impl.cpp:1.3   Sat Jan  7 04:44:09 2006
+++ gnash/server/impl.cpp       Thu Jan 12 10:28:12 2006
@@ -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;
                                }