[src/trunk]: src/include Don't pollute the namespace with stdint.h. (This fil...

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dc7e61fcfca2
branches:  trunk
changeset: 768595:dc7e61fcfca2
user:      dholland <dholland%NetBSD.org@localhost>
date:      Mon Aug 22 01:24:15 2011 +0000

description:
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.

diffstat:

 include/strings.h |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 4092724e7722 -r dc7e61fcfca2 include/strings.h
--- a/include/strings.h Mon Aug 22 00:33:16 2011 +0000
+++ b/include/strings.h Mon Aug 22 01:24:15 2011 +0000
@@ -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);