Module Name: src
Committed By: dholland
Date: Mon Aug 22 01:24:16 UTC 2011
Modified Files:
src/include: strings.h
Log Message:
Don't pollute the namespace with stdint.h. (This file is included from
string.h so it can't blithely do whatever it feels like.) PR 45258.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/include/strings.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/strings.h
diff -u src/include/strings.h:1.17 src/include/strings.h:1.18
--- src/include/strings.h:1.17 Wed Aug 19 04:22:53 2009
+++ src/include/strings.h Mon Aug 22 01:24:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: strings.h,v 1.17 2009/08/19 04:22:53 yamt Exp $ */
+/* $NetBSD: strings.h,v 1.18 2011/08/22 01:24:15 dholland Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
#include <sys/cdefs.h>
-#include <stdint.h>
+#include <machine/int_types.h>
__BEGIN_DECLS
int bcmp(const void *, const void *, size_t);
@@ -57,8 +57,8 @@
unsigned int popcount(unsigned int) __constfunc;
unsigned int popcountl(unsigned long) __constfunc;
unsigned int popcountll(unsigned long long) __constfunc;
-unsigned int popcount32(uint32_t) __constfunc;
-unsigned int popcount64(uint64_t) __constfunc;
+unsigned int popcount32(__uint32_t) __constfunc;
+unsigned int popcount64(__uint64_t) __constfunc;
char *rindex(const char *, int);
int strcasecmp(const char *, const char *);
int strncasecmp(const char *, const char *, size_t);
