X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/6d2010ae8f7a6078e10b361c6962983bab233e0f..c6bf4f310a33a9262d455ea4d3f0630b1255e3fe:/libsyscall/mach/string.h

diff --git a/libsyscall/mach/string.h b/libsyscall/mach/string.h
index 9b20980cf..833c6af05 100644
--- a/libsyscall/mach/string.h
+++ b/libsyscall/mach/string.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2010 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
- * 
+ *
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -22,7 +22,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
+ *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
@@ -31,31 +31,19 @@
 
 #include <stdarg.h>
 #include <_types.h>
-
-#ifndef SIZE_T
-#define SIZE_T
-typedef __darwin_size_t size_t;
-#endif
-
-#ifndef NULL
-#define NULL __DARWIN_NULL
-#endif
-
-#ifndef _UINTPTR_T
-#define _UINTPTR_T
-typedef unsigned long   uintptr_t;
-#endif /* _UINTPTR_T */
+#include <sys/_types/_null.h>
+#include <sys/_types/_size_t.h>
+#include <sys/_types/_uintptr_t.h>
 
 // We're purposefully called "string.h" in order to superceed any use
 // of Libc's string.h (which no one should be using bar MIG) in order
 // to override their use of memcpy.
 
-int _mach_snprintf(char *buffer, int length, const char *fmt, ...);
-int _mach_vsnprintf(char *buffer, int length, const char *fmt, va_list ap);
+int _mach_snprintf(char *buffer, int length, const char *fmt, ...) __printflike(3, 4);
+int _mach_vsnprintf(char *buffer, int length, const char *fmt, va_list ap) __printflike(3, 0);
 
 // Actually in memcpy.c but MIG likes to include string.h
 
 void *memcpy(void *dst0, const void *src0, size_t length);
-int memcmp(const void *s1, const void *s2, size_t n);
 
 #endif /* _STRING_H_ */