Ticket #8789: scummvm_beos.2.patch

configure

@@ -955 +955 @@
 echo_n "Checking hosttype... "
 echo $_host_os
 case $_host_os in
-        linux* | uclinux* | openbsd* | freebsd* | netbsd* | bsd* | sunos* | hpux* | beos*)
+        linux* | uclinux* | openbsd* | freebsd* | netbsd* | bsd* | sunos* | hpux* )
                 DEFINES="$DEFINES -DUNIX"
                 ;;
+        beos*)
+                DEFINES="$DEFINES -DUNIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
+                LIBS="$LIBS -lbind -lsocket"
+                LDFLAGS="$LDFLAGS"
+                type_1_byte='char'
+                type_2_byte='short'
+                type_4_byte='long'
+                ;;
         solaris*)
                 DEFINES="$DEFINES -DUNIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
                 ;;
@@ -1266 +1274 @@
 fi
 
 #
+# Check for math lib
+#
+cc_check $LDFLAGS $CXXFLAGS -lm && LDFLAGS="$LDFLAGS -lm"
+
+#
 # Check for Ogg Vorbis
 #
 echocheck "Ogg Vorbis"
@@ -1276 +1289 @@
 int main(void) { vorbis_packet_blocksize(0,0); return 0; }
 EOF
         cc_check $LDFLAGS $CXXFLAGS $OGG_CFLAGS $OGG_LIBS $VORBIS_CFLAGS $VORBIS_LIBS \
-                -lvorbisfile -lvorbis -logg -lm && _vorbis=yes
+                -lvorbisfile -lvorbis -logg && _vorbis=yes
 fi
 if test "$_vorbis" = yes ; then
         _def_vorbis='#define USE_VORBIS'
@@ -1328 +1341 @@
 int main(void) { return FLAC__STREAM_SYNC_LEN >> 30; /* guaranteed to be 0 */ }
 EOF
         cc_check $LDFLAGS $CXXFLAGS $FLAC_CFLAGS $FLAC_LIBS $OGG_CFLAGS $OGG_LIBS \
-                -lFLAC -logg -lm && _flac=yes
+                -lFLAC -logg && _flac=yes
 fi
 if test "$_flac" = yes ; then
         _def_flac='#define USE_FLAC'

common/hashmap.h

@@ -18 +18 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/branch-0-11-0/common/hashmap.h $
- * $Id: hashmap.h 30484 2008-01-14 19:01:08Z fingolfin $
+ * $URL$
+ * $Id$
  *
  */
 
@@ -86 +86 @@
 template <class Key, class Val, class HashFunc = Hash<Key>, class EqualFunc = EqualTo<Key> >
 class HashMap {
 private:
-#if defined (PALMOS_MODE)
+#if defined (PALMOS_MODE) || defined (__BEOS__)
 public:
 #endif
 
@@ -116 +116 @@
         int lookupAndCreateIfMissing(const Key &key);
         void expand_array(uint newsize);
 
+        class ConstIterator;
+
         /**
          * Simple HashMap iterator implementation.
          */
@@ -135 +137 @@
 
                 Node *deref() const {
                         assert(_hashmap != 0);
+                        assert(_idx < _arrsize);
                         Node *node = _hashmap->_arr[_idx];
                         assert(node != 0);
                         return node;
@@ -172 +175 @@
          * This is almost completely identical to the normal iterator class, only
          * with some const keywords added here and there, plus a conversion
          * operator which makes it possible to transparently convert iterators to
-         * const iterators. 
+         * const iterators.
          * It is sadly not really possible to reduce this code duplication using
          * template, unless one is willing to accept various warnings on certain
          * compilers. Note that many (most? all?) implementations of the standard