vc7.1 fixes

dtool/Config.Win32.pp

@@ -109,10 +109,5 @@
 // Must global operator new and delete functions throw exceptions?
 #define GLOBAL_OPERATOR_NEW_EXCEPTIONS
 
-// What is the syntax of the STL allocator declaration?  See
-// LocalSetup.pp for allowable values.
-//#define STL_ALLOCATOR VC6
-#define STL_ALLOCATOR MODERN
-
 // can Intel C++ build this directory successfully (if not, change CC to msvc)
 #define NOT_INTEL_BUILDABLE false

dtool/pptempl/Template.gmsvc.pp

@@ -636,7 +636,7 @@ $[TAB] cp -f $[ODIR]/$[local] $[dest]
 
 $[output_exe] : $[input_exe]
 $[TAB] rm -f $[output_exe]
-$[TAB] $[bin_postprocess_cmd] $[input_exe] $[bin_postprocess_arg1] $[output_exe]
+$[TAB] $[bin_postprocess_cmd] $[bin_postprocess_arg1] $[input_exe] $[bin_postprocess_arg2] $[output_exe]
 
 $[install_bin_dir]/$[bin_postprocess_target].exe : $[output_exe]
 $[TAB] cp -f $[output_exe] $[install_bin_dir]

dtool/pptempl/compilerSettings.pp

@@ -44,12 +44,23 @@
   // ensure pdbs are copied to install dir
   #define build_pdbs yes  
   
+  #define STL_ALLOCATOR VC6
+  
 #elif $[or $[eq $[USE_COMPILER], MSVC7], $[eq $[USE_COMPILER], MSVC7_1]]
 
   #define COMPILER cl
   #define LINKER link
   #define LIBBER lib
 
+  #if $[eq $[USE_COMPILER], MSVC7]  
+    // What is the syntax of the STL allocator declaration?  See
+    // LocalSetup.pp for allowable values.
+    #define STL_ALLOCATOR MODERN
+  #else
+    // until I figure out how to get rid of 'rebind' vc7.1 C4346 build errors
+    #define STL_ALLOCATOR UNKNOWN
+  #endif  
+
   #if $[eq $[NO_CROSSOBJ_OPT],]
      #define DO_CROSSOBJ_OPT 1
   #endif 

dtool/src/dtoolbase/dallocator.h

@@ -87,8 +87,9 @@ public:
   INLINE pointer allocate(size_type n, allocator<void>::const_pointer hint = 0);
   INLINE void deallocate(void *p, size_type n);
 
-  template<class U>
-  struct rebind { typedef dallocator<U> other; };
+  template<class U> struct rebind { 
+	  typedef dallocator<U> other; 
+  };
 };
 
 #else