Bug 1189891: Only include STL wrapper requirements on the first inclu…

…de. r=glandium
dothq · Aug 21, 2015 · 8ae317b · 8ae317b
1 parent 663bb5d
commit 8ae317b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/config/msvc-stl-wrapper.template.h b/config/msvc-stl-wrapper.template.h
@@ -8,6 +8,9 @@
 #ifndef mozilla_${HEADER}_h
 #define mozilla_${HEADER}_h
 
+#ifndef MOZ_HAVE_INCLUDED_ALLOC
+#define MOZ_HAVE_INCLUDED_ALLOC
+
 #if _HAS_EXCEPTIONS
 #  error "STL code can only be used with -fno-exceptions"
 #endif
@@ -32,6 +35,7 @@
 #else
 #  error "STL code can only be used with infallible ::operator new()"
 #endif
+#endif /* MOZ_HAVE_INCLUDED_ALLOC */
 
 #ifdef _DEBUG
 // From