diff options
| author | joerg <joerg@pkgsrc.org> | 2008-10-08 14:28:14 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2008-10-08 14:28:14 +0000 |
| commit | aa020a8ff4337fcc24cdd7d0cdc881130b5a5f46 (patch) | |
| tree | 326fbe76f105c3ea1cb06e3ef7e517cb478ab145 /pkgtools/libnbcompat | |
| parent | 8e4a90320c111301b4cbd9766b20f9a353a40d7e (diff) | |
| download | pkgsrc-aa020a8ff4337fcc24cdd7d0cdc881130b5a5f46.tar.gz | |
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 (limited to 'pkgtools/libnbcompat')
| -rw-r--r-- | pkgtools/libnbcompat/files/nbcompat/md5.h | 4 | ||||
| -rw-r--r-- | pkgtools/libnbcompat/files/nbcompat/sha1.h | 4 | ||||
| -rw-r--r-- | pkgtools/libnbcompat/files/nbcompat/sha2.h | 2 | ||||
| -rw-r--r-- | pkgtools/libnbcompat/files/nbcompat/types.h | 10 |
4 files changed, 17 insertions, 3 deletions
diff --git a/pkgtools/libnbcompat/files/nbcompat/md5.h b/pkgtools/libnbcompat/files/nbcompat/md5.h index d0565aaf78a..682f4e45408 100644 --- a/pkgtools/libnbcompat/files/nbcompat/md5.h +++ b/pkgtools/libnbcompat/files/nbcompat/md5.h @@ -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 --git a/pkgtools/libnbcompat/files/nbcompat/sha1.h b/pkgtools/libnbcompat/files/nbcompat/sha1.h index ae2a19d534c..1fc256d4346 100644 --- a/pkgtools/libnbcompat/files/nbcompat/sha1.h +++ b/pkgtools/libnbcompat/files/nbcompat/sha1.h @@ -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 --git a/pkgtools/libnbcompat/files/nbcompat/sha2.h b/pkgtools/libnbcompat/files/nbcompat/sha2.h index a52c7e626c4..ef10a46e22d 100644 --- a/pkgtools/libnbcompat/files/nbcompat/sha2.h +++ b/pkgtools/libnbcompat/files/nbcompat/sha2.h @@ -36,6 +36,8 @@ #ifndef __SHA2_H__ #define __SHA2_H__ +#include <nbcompat/types.h> + #ifdef __cplusplus extern "C" { #endif diff --git a/pkgtools/libnbcompat/files/nbcompat/types.h b/pkgtools/libnbcompat/files/nbcompat/types.h index 1c8ca7bb949..c1d5774e720 100644 --- a/pkgtools/libnbcompat/files/nbcompat/types.h +++ b/pkgtools/libnbcompat/files/nbcompat/types.h @@ -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>. */ |