[cfe-commits] r160287 - /cfe/trunk/lib/Rewrite/RewriteModernObjC.cpp

[Fariborz Jahanian]

Author: fjahanian
Date: Mon Jul 16 11:21:45 2012
New Revision: 160287

URL: http://llvm.org/viewvc/llvm-project?rev=160287&view=rev
Log:
modern objective-c translator: conditionally include
<string.h>. // rdar://11847319

Modified:
    cfe/trunk/lib/Rewrite/RewriteModernObjC.cpp

Modified: cfe/trunk/lib/Rewrite/RewriteModernObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Rewrite/RewriteModernObjC.cpp?rev=160287&r1=160286&r2=160287&view=diff
==============================================================================
--- cfe/trunk/lib/Rewrite/RewriteModernObjC.cpp (original)
+++ cfe/trunk/lib/Rewrite/RewriteModernObjC.cpp Mon Jul 16 11:21:45 2012
@@ -5959,7 +5959,11 @@
     Preamble += "#define __block\n";
     Preamble += "#define __weak\n";
   }
-  Preamble += "\nextern \"C\" void * memset(void *b, int c, unsigned long len);\n";
+  Preamble += "\n#if defined(_MSC_VER)\n";
+  Preamble += "#include <string.h>\n";
+  Preamble += "#else\n";
+  Preamble += "extern \"C\" void * memset(void *b, int c, unsigned long len);\n";
+  Preamble += "#endif\n";
   
   // Declarations required for modern objective-c array and dictionary literals.
   Preamble += "\n#include <stdarg.h>\n";