summaryrefslogtreecommitdiff
path: root/stdcpp.h
diff options
context:
space:
mode:
Diffstat (limited to 'stdcpp.h')
-rw-r--r--stdcpp.h18
1 files changed, 11 insertions, 7 deletions
diff --git a/stdcpp.h b/stdcpp.h
index 9a468ab..234bf54 100644
--- a/stdcpp.h
+++ b/stdcpp.h
@@ -4,24 +4,28 @@
#include <stddef.h>
#include <assert.h>
#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
#include <memory>
#include <string>
#include <exception>
#include <typeinfo>
-
-
-#ifdef _MSC_VER
-#include <string.h> // CodeWarrior doesn't have memory.h
#include <algorithm>
#include <map>
#include <vector>
-// re-disable this
-#pragma warning(disable: 4231)
+// for alloca
+#ifdef __sun
+#include <alloca.h>
+#elif defined(__MINGW32__)
+#include <malloc.h>
#endif
-#if defined(_MSC_VER) && defined(_CRTAPI1)
+#ifdef _MSC_VER
+#pragma warning(disable: 4231) // re-disable this
+#ifdef _CRTAPI1
#define CRYPTOPP_MSVCRT6
#endif
+#endif
#endif