summaryrefslogtreecommitdiffstats
path: root/cad/spice/files
diff options
context:
space:
mode:
authorjoerg <joerg@FreeBSD.org>2002-08-25 19:23:42 +0000
committerjoerg <joerg@FreeBSD.org>2002-08-25 19:23:42 +0000
commiteb31bb8232cc48e6ce1ea269922dd37a8184d248 (patch)
tree6ce5f8bff86d373ef86164f2c4c8940f9a407757 /cad/spice/files
parente6260cb98d51d9a1055b12742526af60f31d32b1 (diff)
downloadFreeBSD-ports-eb31bb8232cc48e6ce1ea269922dd37a8184d248.zip
FreeBSD-ports-eb31bb8232cc48e6ce1ea269922dd37a8184d248.tar.gz
More FreeBSD tweaking in os_bsd.h:
. Declare HAS_INTWAITSTATUS in order to get it to compil at all (wonder how this used to work before) . While i was at it, use HAS_SYSVDIRS instead of HAS_BSDDIRS to get rid of the obsolescence warning in <sys/dir.h>.
Diffstat (limited to 'cad/spice/files')
-rw-r--r--cad/spice/files/patch-aa88
1 files changed, 38 insertions, 50 deletions
diff --git a/cad/spice/files/patch-aa b/cad/spice/files/patch-aa
index f6e7d5d..30d935b 100644
--- a/cad/spice/files/patch-aa
+++ b/cad/spice/files/patch-aa
@@ -150,53 +150,41 @@
# ifndef index
# ifdef HAS_INDEX
-*** src/include/os_bsd.h.orig Sat Apr 24 18:09:46 1993
---- src/include/os_bsd.h Tue Jun 2 22:28:04 1998
-***************
-*** 8,19 ****
-
- #include "os_unix.h"
-
- #define HAS_NO_ATRIGH_DECL /* if asinh( ) is not in math.h */
-- #define HAS_ATRIGH /* acosh( ), asinh( ), atanh( ) */
- #define HAS_FTIME /* ftime( ), <times.h> */
- #define HAS_TERMCAP /* tgetxxx( ) */
- #define HAS_VFORK /* BSD-ism, should not be necessary */
-- #define HAS_INDEX /* index( ) instead of strchr( ) */
- #define HAS_BCOPY /* bcopy( ), bzero( ) */
- #define HAS_BSDRANDOM /* srandom( ) and random( ) */
- #define HAS_BSDTTY /* <sgtty.h> */
---- 8,23 ----
-
- #include "os_unix.h"
-
-+ #ifndef __FreeBSD__
- #define HAS_NO_ATRIGH_DECL /* if asinh( ) is not in math.h */
- #define HAS_FTIME /* ftime( ), <times.h> */
-+ #define HAS_INDEX /* index( ) instead of strchr( ) */
-+ #define HAS_STRINGS /* use <strings.h> instead of <string.h> */
-+ #endif
-+
-+ #define HAS_ATRIGH /* acosh( ), asinh( ), atanh( ) */
- #define HAS_TERMCAP /* tgetxxx( ) */
- #define HAS_VFORK /* BSD-ism, should not be necessary */
- #define HAS_BCOPY /* bcopy( ), bzero( ) */
- #define HAS_BSDRANDOM /* srandom( ) and random( ) */
- #define HAS_BSDTTY /* <sgtty.h> */
-***************
-*** 22,25 ****
- #define HAS_BSDRLIMIT /* getrlimit( ) */
- #define HAS_DUP2
- #define HAS_GETWD /* getwd(buf) */
-! #define HAS_STRINGS /* use <strings.h> instead of <string.h> */
---- 26,35 ----
- #define HAS_BSDRLIMIT /* getrlimit( ) */
- #define HAS_DUP2
- #define HAS_GETWD /* getwd(buf) */
-!
-! #ifdef __FreeBSD__
-! #define HAS_BSDSOCKETS /* <net/inet.h>, socket( ), etc. */
-! #define HAS_BSDTIME /* gettimeofday( ) return time */
-! #define HAS_FLOAT_H /* float.h */
-! #define HAS_STRCHR /* strchr( ) instead of index( ) */
-! #endif
+--- src/include/os_bsd.h.orig Sun Apr 25 01:09:46 1993
++++ src/include/os_bsd.h Sun Aug 25 21:09:59 2002
+@@ -8,18 +8,31 @@
+
+ #include "os_unix.h"
+
++#ifdef __FreeBSD__
++#define HAS_SYSVDIRS /* <sys/dirent.h> */
++#define HAS_INTWAITSTATUS /* wait(3) takes an int *, not a union */
++#else
+ #define HAS_NO_ATRIGH_DECL /* if asinh( ) is not in math.h */
+-#define HAS_ATRIGH /* acosh( ), asinh( ), atanh( ) */
+ #define HAS_FTIME /* ftime( ), <times.h> */
++#define HAS_INDEX /* index( ) instead of strchr( ) */
++#define HAS_STRINGS /* use <strings.h> instead of <string.h> */
++#define HAS_BSDDIRS /* <sys/dir.h> */
++#endif
++
++#define HAS_ATRIGH /* acosh( ), asinh( ), atanh( ) */
+ #define HAS_TERMCAP /* tgetxxx( ) */
+ #define HAS_VFORK /* BSD-ism, should not be necessary */
+-#define HAS_INDEX /* index( ) instead of strchr( ) */
+ #define HAS_BCOPY /* bcopy( ), bzero( ) */
+ #define HAS_BSDRANDOM /* srandom( ) and random( ) */
+ #define HAS_BSDTTY /* <sgtty.h> */
+-#define HAS_BSDDIRS /* <sys/dir.h> */
+ #define HAS_BSDRUSAGE /* getrusage( ) */
+ #define HAS_BSDRLIMIT /* getrlimit( ) */
+ #define HAS_DUP2
+ #define HAS_GETWD /* getwd(buf) */
+-#define HAS_STRINGS /* use <strings.h> instead of <string.h> */
++
++#ifdef __FreeBSD__
++#define HAS_BSDSOCKETS /* <net/inet.h>, socket( ), etc. */
++#define HAS_BSDTIME /* gettimeofday( ) return time */
++#define HAS_FLOAT_H /* float.h */
++#define HAS_STRCHR /* strchr( ) instead of index( ) */
++#endif
OpenPOWER on IntegriCloud