Eliminate conflicting function declarations on Darwin.

This commit is contained in:
kristerw 2005-07-08 19:25:34 +00:00
parent 174bfe43a7
commit b22d56bd67
3 changed files with 7 additions and 7 deletions

View file

@ -1,11 +1,11 @@
$NetBSD: distinfo,v 1.8 2005/03/10 16:58:39 tv Exp $
$NetBSD: distinfo,v 1.9 2005/07/08 19:25:34 kristerw Exp $
SHA1 (es-0.9-alpha1.tar.gz) = 5027c9dade742c437b8e471a356d15883ebc4732
RMD160 (es-0.9-alpha1.tar.gz) = ca2307202ab6e65c49188e3228d1af6426a23952
Size (es-0.9-alpha1.tar.gz) = 125913 bytes
SHA1 (patch-aa) = 0ecb437885e77c07ef9c6d677cefe9d0ae6b86d8
SHA1 (patch-ab) = bd58fbbf71d5c9dc76bdc380cb7b93ad3f5f1c72
SHA1 (patch-ac) = 52091c57f8f5bdcbf62069ae19200a7fc4bb88c0
SHA1 (patch-ad) = ef0552148d9d0fdabb1dec72b3084eaaa33513c8
SHA1 (patch-ac) = a5b166c8196f51e59f317a95ba2f1ae2cb42f6e4
SHA1 (patch-ad) = 7af899985d5e3f2f4fb4ed4ce02696583f308f87
SHA1 (patch-ae) = 3625310b30bbf64f24d6efbcd1864b7e8a92ff59
SHA1 (patch-af) = e637be09b74092fb2fc5c34a7c09b824da4eea26

View file

@ -1,4 +1,4 @@
$NetBSD: patch-ac,v 1.2 2005/01/25 04:46:29 tv Exp $
$NetBSD: patch-ac,v 1.3 2005/07/08 19:25:34 kristerw Exp $
--- main.c~ Tue May 30 06:13:50 1995
+++ main.c Thu Apr 10 09:20:49 1997
@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.2 2005/01/25 04:46:29 tv Exp $
#endif
-#if !HPUX && !defined(linux)
+#if !HPUX && !defined(linux) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__INTERIX)
+#if !HPUX && !defined(linux) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__INTERIX) && !defined(__APPLE__)
extern int getopt (int argc, char **argv, const char *optstring);
#endif
extern int optind;

View file

@ -1,4 +1,4 @@
$NetBSD: patch-ad,v 1.4 2005/03/10 15:18:31 tv Exp $
$NetBSD: patch-ad,v 1.5 2005/07/08 19:25:34 kristerw Exp $
--- stdenv.h.orig 1995-05-30 07:13:53.000000000 -0400
+++ stdenv.h
@ -25,7 +25,7 @@ $NetBSD: patch-ad,v 1.4 2005/03/10 15:18:31 tv Exp $
/* stdlib */
+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__INTERIX)
+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__INTERIX) && !defined(__APPLE__)
extern noreturn exit(int);
extern noreturn abort(void);
extern long strtol(const char *num, char **end, int base);