summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Kremenek <kremenek@apple.com>2010-03-08 23:23:45 +0000
committerTed Kremenek <kremenek@apple.com>2010-03-08 23:23:45 +0000
commit0a4a8326c1027e6a7faa48eec5497e8189e7e159 (patch)
treea1fd3535c5abec4bc595ba2f8f44765775cc37fe
parent27a973245022c0ed4e69b291daf79d6d99c1844f (diff)
downloadbcm5719-llvm-0a4a8326c1027e6a7faa48eec5497e8189e7e159.tar.gz
bcm5719-llvm-0a4a8326c1027e6a7faa48eec5497e8189e7e159.zip
Add preprocessor guards to the definitions of size_t and wchar_t, and #undef NULL before defining it.
This addresses potential issues with system headers reported in <rdar://problem/7727159>. llvm-svn: 98006
-rw-r--r--clang/lib/Headers/stddef.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/clang/lib/Headers/stddef.h b/clang/lib/Headers/stddef.h
index 2c84b4b066c..6868ad341fd 100644
--- a/clang/lib/Headers/stddef.h
+++ b/clang/lib/Headers/stddef.h
@@ -27,11 +27,18 @@
#define __STDDEF_H
typedef __typeof__(((int*)0)-((int*)0)) ptrdiff_t;
+#ifndef _SIZE_T
+#define _SIZE_T
typedef __typeof__(sizeof(int)) size_t;
+#endif
#ifndef __cplusplus
+#ifndef _WCHAR_T
+#define _WCHAR_T
typedef __typeof__(*L"") wchar_t;
#endif
+#endif
+#undef NULL
#ifdef __cplusplus
#define NULL __null
#else
OpenPOWER on IntegriCloud