Tau fixes

dtool/pptempl/compilerSettings.pp

@@ -224,6 +224,6 @@
 #endif
 
 #defer tau_opts $[decygwin %,-I"%",$[EXTRA_INCPATH] $[ipath] $[WIN32_PLATFORMSDK_INCPATH] $[tau_ipath]] $[building_var:%=-D%]
-#defer TAU_MAKE_IL $[PDT_ROOT]/Windows/bin/edgcpfe -o $[il_source] $[tau_opts] $[cdefines:%=-D%] $[TAU_INSTRUMENTOR_FLAGS] $[source]
+#defer TAU_MAKE_IL $[PDT_ROOT]/Windows/bin/edgcpfe -o $[il_source] $[tau_opts] $[cdefines:%=-D%] -DWIN32=1 $[TAU_INSTRUMENTOR_FLAGS] $[source]
 #defer TAU_MAKE_PDB $[PDT_ROOT]/Windows/bin/taucpdisp $[il_source] > $[pdb_source]
 #defer TAU_MAKE_INST $[TAU_ROOT]/bin/tau_instrumentor $[pdb_source] $[source] -o $[inst_source]

dtool/src/dtoolbase/dtoolbase_cc.h

@@ -183,6 +183,9 @@ INLINE void operator delete[](void *ptr) {
   (*global_operator_delete)(ptr);
 }
 
+#endif  // GLOBAL_OPERATOR_NEW_EXCEPTIONS
+#endif  // USE_MEMORY_NOWRAPPERS
+
 #if defined(USE_TAU) && defined(WIN32)
 // Hack around tau's lack of DLL export declarations for Profiler class.
 extern EXPCL_DTOOL bool __tau_shutdown;
@@ -215,9 +218,5 @@ private:
 
 #endif  // USE_TAU
 
-#endif  // GLOBAL_OPERATOR_NEW_EXCEPTIONS
-#endif  // USE_MEMORY_NOWRAPPERS
-
 #endif  //  __cplusplus
-
 #endif