summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1996-08-22 08:08:49 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1996-08-22 08:08:49 +0000
commit37747b24dab9f726f10fe346818652644f356640 (patch)
tree9d6d2842c7cd1ff3b179dc2c6091e579e62cf6d3
parent6ac491ee0f51c85d36d8f83ed5cda01925235786 (diff)
__OpenBSD__
-rw-r--r--gnu/usr.bin/cpio/fnmatch.h2
-rw-r--r--gnu/usr.bin/diff/getopt.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/gnu/usr.bin/cpio/fnmatch.h b/gnu/usr.bin/cpio/fnmatch.h
index 4579c9fc721..ff6d42fed84 100644
--- a/gnu/usr.bin/cpio/fnmatch.h
+++ b/gnu/usr.bin/cpio/fnmatch.h
@@ -24,7 +24,7 @@ extern "C" {
#endif
#if defined (__cplusplus) || (defined (__STDC__) && __STDC__)
-#ifndef __NetBSD__
+#if !(defined(_NetBSD__) || defined(__OpenBSD__))
#undef __P
#define __P(args) args
#else
diff --git a/gnu/usr.bin/diff/getopt.c b/gnu/usr.bin/diff/getopt.c
index 21fa7fad286..f7c5550deb8 100644
--- a/gnu/usr.bin/diff/getopt.c
+++ b/gnu/usr.bin/diff/getopt.c
@@ -53,7 +53,7 @@
/* This needs to come after some library #include
to get __GNU_LIBRARY__ defined. */
-#if defined(__GNU_LIBRARY__) || defined(__NetBSD__)
+#if defined(__GNU_LIBRARY__) || defined(__NetBSD__) || defined(__OpenBSD__)
/* Don't include stdlib.h for non-GNU C libraries because some of them
contain conflicting prototypes for getopt. */
#include <stdlib.h>
@@ -155,7 +155,7 @@ static enum
/* Value of POSIXLY_CORRECT environment variable. */
static char *posixly_correct;
-#if defined(__GNU_LIBRARY__) || defined(__NetBSD__)
+#if defined(__GNU_LIBRARY__) || defined(__NetBSD__) || defined(__OpenBSD__)
/* We want to avoid inclusion of string.h with non-GNU libraries
because there are many ways it can cause trouble.
On some systems, it contains special magic macros that don't work