Index: clang-3.0/tools/clang/include/clang/Basic/Builtins.def
===================================================================
--- clang-3.0.orig/tools/clang/include/clang/Basic/Builtins.def	2011-12-11 11:12:03.292610250 +0100
+++ clang-3.0/tools/clang/include/clang/Basic/Builtins.def	2011-12-11 11:12:35.388611133 +0100
@@ -690,8 +690,8 @@
 LIBBUILTIN(_longjmp, "vJi",       "fr",    "setjmp.h", ALL_LANGUAGES)
 LIBBUILTIN(siglongjmp, "vSJi",    "fr",    "setjmp.h", ALL_LANGUAGES)
 // non-standard but very common
-LIBBUILTIN(strlcpy, "zc*cC*z",    "f",     "string.h", ALL_LANGUAGES)
-LIBBUILTIN(strlcat, "zc*cC*z",    "f",     "string.h", ALL_LANGUAGES)
+//LIBBUILTIN(strlcpy, "zc*cC*z",    "f",     "string.h", ALL_LANGUAGES)
+//LIBBUILTIN(strlcat, "zc*cC*z",    "f",     "string.h", ALL_LANGUAGES)
 //   id objc_msgSend(id, SEL, ...)
 LIBBUILTIN(objc_msgSend, "GGH.",   "f",     "objc/message.h", OBJC_LANG)
 
Index: clang-3.0/tools/clang/lib/Sema/SemaChecking.cpp
===================================================================
--- clang-3.0.orig/tools/clang/lib/Sema/SemaChecking.cpp	2011-12-11 11:12:03.296610250 +0100
+++ clang-3.0/tools/clang/lib/Sema/SemaChecking.cpp	2011-12-11 11:12:57.532611743 +0100
@@ -381,11 +381,11 @@
     CMF = CMF_Memmove;
     break;
 
-  case Builtin::BIstrlcpy:
-  case Builtin::BIstrlcat:
-    CheckStrlcpycatArguments(TheCall, FnInfo);
-    break;
-    
+//  case Builtin::BIstrlcpy:
+//  case Builtin::BIstrlcat:
+//    CheckStrlcpycatArguments(TheCall, FnInfo);
+//    break;
+
   case Builtin::BI__builtin_memcmp:
     CMF = CMF_Memcmp;
     break;