fix Linux compile from mhash stuff

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@339 8a3a26a2-13c4-0310-b231-cf6edde360e5

diff --git a/SConscript.q3map2 b/SConscript.q3map2
index 963f51af2333a6b3ccfe0faad09cdec40e5e18a0..30ba5cbeff11fd66598b8c860996a5f7f4d3d389 100644 (file)
--- a/SConscript.q3map2
+++ b/SConscript.q3map2
@@ -10,7 +10,7 @@ Import( [ 'utils', 'config', 'settings', 'lib_objects' ] )
 env = Environment()
 settings.SetupEnvironment( env, config['name'] )
 env.Prepend( CPPPATH = [ '#tools/quake3/common' ] )
-env.Append( LIBS = [ 'pthread', 'png', 'jpeg', 'mhash' ] )
+env.Append( LIBS = [ 'pthread', 'png', 'jpeg' ] )
 proj = utils.vcproj( os.path.join( GetLaunchDir(), 'tools/quake3/q3map2/q3map2.vcproj' ) )
 objects = lib_objects
 objects += [ os.path.join( 'tools/quake3/q3map2', i ) for i in proj.getSourceFiles() ]

diff --git a/config.py b/config.py
index 5c6c150d2d46151695ab1d2bc5dec47c40a290b7..563dab65a884c6ebd9b84a9444c0cc75bbdbd608 100644 (file)
--- a/config.py
+++ b/config.py
@@ -158,7 +158,7 @@ class Config:
                        build_dir = os.path.join( 'build', config_name, 'q3map2' )
                        BuildDir( build_dir, '.', duplicate = 0 )
                        lib_objects = []
-                       for project in [ 'libs/cmdlib/cmdlib.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/l_net/l_net.vcproj', 'libs/ddslib/ddslib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/md5lib/md5lib.vcproj' ]:
+                       for project in [ 'libs/cmdlib/cmdlib.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/l_net/l_net.vcproj', 'libs/ddslib/ddslib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/md5lib/md5lib_VC9.vcproj' ]:
                                Export( 'project' )
                                lib_objects += SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
                        Export( 'lib_objects' )

diff --git a/libs/md4lib.h b/libs/md4lib.h
index 518a144354338842df8c9ccfbf927de68a759129..a427af7d636f98980c2cb0f507ba4650ca0a743b 100644 (file)
--- a/libs/md4lib.h
+++ b/libs/md4lib.h
@@ -9,24 +9,28 @@
 #ifndef MD4_H
 #define MD4_H
 
-struct hash_method {\r
-       const char *name;\r
-       /* Number of bytes that must be allocated for context */\r
-       unsigned int context_size;\r
-       /* Number of bytes that must be allocated for result()'s digest */\r
-       unsigned int digest_size;\r
-\r
-       void (*init)(void *context);\r
-       void (*loop)(void *context, const void *data, size_t size);\r
-       void (*result)(void *context, unsigned char *digest_r);\r
-};\r
-\r
-const struct hash_method *hash_method_lookup(const char *name);\r
-\r
-/* NULL-terminated list of all hash methods */\r
-extern const struct hash_method *hash_methods[];
+#ifdef _WIN32
+       #include "stdint.msvc.h"
+#else
+       #include <stdint.h>
+#endif
 
-typedef unsigned int uint_fast32_t;
+struct hash_method {
+       const char *name;
+       /* Number of bytes that must be allocated for context */
+       unsigned int context_size;
+       /* Number of bytes that must be allocated for result()'s digest */
+       unsigned int digest_size;
+
+       void (*init)(void *context);
+       void (*loop)(void *context, const void *data, size_t size);
+       void (*result)(void *context, unsigned char *digest_r);
+};
+
+const struct hash_method *hash_method_lookup(const char *name);
+
+/* NULL-terminated list of all hash methods */
+extern const struct hash_method *hash_methods[];
 
 #define        MD4_RESULTLEN (128/8)
 

diff --git a/libs/md5lib/md4.c b/libs/md5lib/md4.c
index 73defe09f9cec8780b362197befbff97acd83927..2ea36cfd5dcb51d02b0d5522e11802efa7532c99 100644 (file)
--- a/libs/md5lib/md4.c
+++ b/libs/md5lib/md4.c
@@ -18,10 +18,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef _WIN32
-       #include "../stdint.msvc.h"\r
-#endif\r
-
 #include "md4lib.h"
 
 /*