Module Name: src
Committed By: msaitoh
Date: Fri Mar 27 16:28:42 UTC 2009
Modified Files:
src/dist/file/src [netbsd-5]: file.h
src/gnu/dist/texinfo/lib [netbsd-5]: system.h
src/lib/libc/hash [netbsd-5]: hashhl.c
src/lib/libc/md [netbsd-5]: mdXhl.c
Log Message:
Pull up following revision(s) (requested by apb in ticket #579):
gnu/dist/texinfo/lib/system.h 1.11
lib/libc/hash/hashhl.c 1.3
lib/libc/md/mdXhl.c 1.8
dist/file/src/file.h 1.18
Improve the ability to cross-build from Linux and OpenBSD hosts.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.4.1 src/dist/file/src/file.h
cvs rdiff -u -r1.10 -r1.10.4.1 src/gnu/dist/texinfo/lib/system.h
cvs rdiff -u -r1.1 -r1.1.26.1 src/lib/libc/hash/hashhl.c
cvs rdiff -u -r1.7 -r1.7.26.1 src/lib/libc/md/mdXhl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/file/src/file.h
diff -u src/dist/file/src/file.h:1.17 src/dist/file/src/file.h:1.17.4.1
--- src/dist/file/src/file.h:1.17 Sun Aug 31 07:53:33 2008
+++ src/dist/file/src/file.h Fri Mar 27 16:28:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: file.h,v 1.17 2008/08/31 07:53:33 christos Exp $ */
+/* $NetBSD: file.h,v 1.17.4.1 2009/03/27 16:28:41 msaitoh Exp $ */
/*
* Copyright (c) Ian F. Darwin 1986-1995.
@@ -43,6 +43,8 @@
#include <config.h>
#endif
+#include <sys/param.h> /* This might define MIN and MAX */
+
#include <stdio.h> /* Include that here, to make sure __P gets defined */
#include <errno.h>
#include <fcntl.h> /* For open and flags */
Index: src/gnu/dist/texinfo/lib/system.h
diff -u src/gnu/dist/texinfo/lib/system.h:1.10 src/gnu/dist/texinfo/lib/system.h:1.10.4.1
--- src/gnu/dist/texinfo/lib/system.h:1.10 Tue Sep 9 06:32:59 2008
+++ src/gnu/dist/texinfo/lib/system.h Fri Mar 27 16:28:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: system.h,v 1.10 2008/09/09 06:32:59 lukem Exp $ */
+/* $NetBSD: system.h,v 1.10.4.1 2009/03/27 16:28:41 msaitoh Exp $ */
/* system.h: system-dependent declarations; include this first.
Id: system.h,v 1.12 2004/04/26 13:56:57 karl Exp
@@ -269,6 +269,10 @@
/* Some systems don't declare this function in pwd.h. */
struct passwd *getpwnam (const char *name);
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
/* Our library routines not included in any system library. */
extern void *xmalloc (size_t), *xrealloc (void *, size_t);
extern char *xstrdup (const char *);
Index: src/lib/libc/hash/hashhl.c
diff -u src/lib/libc/hash/hashhl.c:1.1 src/lib/libc/hash/hashhl.c:1.1.26.1
--- src/lib/libc/hash/hashhl.c:1.1 Wed Sep 28 16:31:45 2005
+++ src/lib/libc/hash/hashhl.c Fri Mar 27 16:28:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hashhl.c,v 1.1 2005/09/28 16:31:45 christos Exp $ */
+/* $NetBSD: hashhl.c,v 1.1.26.1 2009/03/27 16:28:41 msaitoh Exp $ */
/*
* ----------------------------------------------------------------------------
@@ -16,6 +16,10 @@
#ifdef HASH_ALGORITHM
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
/*
* Do all the name mangling before we include "namespace.h"
*/
@@ -30,7 +34,7 @@
#define HASH_LEN CONCAT(HASH_ALGORITHM,_DIGEST_LENGTH)
#define HASH_STRLEN CONCAT(HASH_ALGORITHM,_DIGEST_STRING_LENGTH)
-#if !defined(_KERNEL) && defined(__weak_alias)
+#if !defined(_KERNEL) && defined(__weak_alias) && !defined(HAVE_NBTOOL_CONFIG_H)
#define WA(a,b) __weak_alias(a,b)
WA(FNPREFIX(End),CONCAT(_,FNPREFIX(End)))
WA(FNPREFIX(FileChunk),CONCAT(_,FNPREFIX(FileChunk)))
@@ -52,10 +56,6 @@
#include <stdlib.h>
#include <unistd.h>
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
#ifndef MIN
#define MIN(x,y) ((x)<(y)?(x):(y))
#endif /* !MIN */
Index: src/lib/libc/md/mdXhl.c
diff -u src/lib/libc/md/mdXhl.c:1.7 src/lib/libc/md/mdXhl.c:1.7.26.1
--- src/lib/libc/md/mdXhl.c:1.7 Mon Sep 26 03:01:41 2005
+++ src/lib/libc/md/mdXhl.c Fri Mar 27 16:28:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mdXhl.c,v 1.7 2005/09/26 03:01:41 christos Exp $ */
+/* $NetBSD: mdXhl.c,v 1.7.26.1 2009/03/27 16:28:42 msaitoh Exp $ */
/*
* ----------------------------------------------------------------------------
@@ -15,10 +15,14 @@
* Modified April 29, 1997 by Jason R. Thorpe <[email protected]>
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#define CONCAT(x,y) __CONCAT(x,y)
#define MDNAME(x) CONCAT(MDALGORITHM,x)
-#if !defined(_KERNEL) && defined(__weak_alias)
+#if !defined(_KERNEL) && defined(__weak_alias) && !defined(HAVE_NBTOOL_CONFIG_H)
#define WA(a,b) __weak_alias(a,b)
WA(MDNAME(End),CONCAT(_,MDNAME(End)))
WA(MDNAME(File),CONCAT(_,MDNAME(File)))
@@ -38,10 +42,6 @@
#include <stdlib.h>
#include <unistd.h>
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
char *
