[pkgsrc/trunk]: pkgsrc/pkgtools/libnbcompat/files/nbcompat Mac OS X doesn't d...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f21942946c15
branches:  trunk
changeset: 548084:f21942946c15
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Oct 08 14:28:14 2008 +0000

description:
Mac OS X doesn't define uintXX_t in sys/types.h, so explicitly pull in
inttypes.h if present. Make md5.h, sha1.h and sha2.h self contained by
including nbcompat/types.h. Problem reported by Greg Troxel.

diffstat:

 pkgtools/libnbcompat/files/nbcompat/md5.h   |   4 +++-
 pkgtools/libnbcompat/files/nbcompat/sha1.h  |   4 +++-
 pkgtools/libnbcompat/files/nbcompat/sha2.h  |   2 ++
 pkgtools/libnbcompat/files/nbcompat/types.h |  10 +++++++++-
 4 files changed, 17 insertions(+), 3 deletions(-)

diffs (72 lines):

diff -r 8393aa082da0 -r f21942946c15 pkgtools/libnbcompat/files/nbcompat/md5.h
--- a/pkgtools/libnbcompat/files/nbcompat/md5.h Wed Oct 08 14:27:35 2008 +0000
+++ b/pkgtools/libnbcompat/files/nbcompat/md5.h Wed Oct 08 14:28:14 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md5.h,v 1.4 2008/10/06 12:36:20 joerg Exp $    */
+/*     $NetBSD: md5.h,v 1.5 2008/10/08 14:28:14 joerg Exp $    */
 
 /*
  * This file is derived from the RSA Data Security, Inc. MD5 Message-Digest
@@ -32,6 +32,8 @@
 #ifndef _NBCOMPAT_SYS_MD5_H_
 #define _NBCOMPAT_SYS_MD5_H_
 
+#include <nbcompat/types.h>
+
 #define MD5_DIGEST_LENGTH              16
 #define MD5_DIGEST_STRING_LENGTH       33
 
diff -r 8393aa082da0 -r f21942946c15 pkgtools/libnbcompat/files/nbcompat/sha1.h
--- a/pkgtools/libnbcompat/files/nbcompat/sha1.h        Wed Oct 08 14:27:35 2008 +0000
+++ b/pkgtools/libnbcompat/files/nbcompat/sha1.h        Wed Oct 08 14:28:14 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sha1.h,v 1.5 2008/10/06 12:36:20 joerg Exp $   */
+/*     $NetBSD: sha1.h,v 1.6 2008/10/08 14:28:14 joerg Exp $   */
 
 /*
  * SHA-1 in C
@@ -9,6 +9,8 @@
 #ifndef _NBCOMPAT_SYS_SHA1_H_
 #define        _NBCOMPAT_SYS_SHA1_H_
 
+#include <nbcompat/types.h>
+
 #define SHA1_DIGEST_LENGTH             20
 #define SHA1_DIGEST_STRING_LENGTH      41
 
diff -r 8393aa082da0 -r f21942946c15 pkgtools/libnbcompat/files/nbcompat/sha2.h
--- a/pkgtools/libnbcompat/files/nbcompat/sha2.h        Wed Oct 08 14:27:35 2008 +0000
+++ b/pkgtools/libnbcompat/files/nbcompat/sha2.h        Wed Oct 08 14:28:14 2008 +0000
@@ -36,6 +36,8 @@
 #ifndef __SHA2_H__
 #define __SHA2_H__
 
+#include <nbcompat/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff -r 8393aa082da0 -r f21942946c15 pkgtools/libnbcompat/files/nbcompat/types.h
--- a/pkgtools/libnbcompat/files/nbcompat/types.h       Wed Oct 08 14:27:35 2008 +0000
+++ b/pkgtools/libnbcompat/files/nbcompat/types.h       Wed Oct 08 14:28:14 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: types.h,v 1.2 2008/04/29 05:46:08 martin Exp $ */
+/*     $NetBSD: types.h,v 1.3 2008/10/08 14:28:14 joerg Exp $  */
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -37,6 +37,14 @@
 #endif
 
 /*
+ * BSD code generally assumes that this types are present, so pull this in
+ * here for platforms like Mac OS X.
+ */
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
+/*
  * Declare macros and functions that may be missing in <sys/types.h>.
  */