summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchuck <chuck@pkgsrc.org>2008-11-20 21:30:05 +0000
committerchuck <chuck@pkgsrc.org>2008-11-20 21:30:05 +0000
commit61817e2267a6fdd8b41595201b59a5d67c98239c (patch)
treece5a79037331a94161acf414c8048e333cdec2ce
parent75f7753388fb436210827d911d91465e1c4890d7 (diff)
downloadpkgsrc-61817e2267a6fdd8b41595201b59a5d67c98239c.tar.gz
make SIM_INLINE functions in the VAX emulator compile properly when
c99 style-inline functions are in effect (e.g. on Darwin and when __GNUC_STDC_INLINE__ is defined). (this was reported back when 3.8 came out on the simh mailing list, so hopefully Bob Supnik and crew will include a fix in the next release, when ever that is.)
-rw-r--r--emulators/simh/distinfo3
-rw-r--r--emulators/simh/patches/patch-ad25
2 files changed, 27 insertions, 1 deletions
diff --git a/emulators/simh/distinfo b/emulators/simh/distinfo
index d1bf725bc4b..9a42dfc4a0d 100644
--- a/emulators/simh/distinfo
+++ b/emulators/simh/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2008/11/01 05:15:42 obache Exp $
+$NetBSD: distinfo,v 1.14 2008/11/20 21:30:05 chuck Exp $
SHA1 (simhv38-0.zip) = e1afbebede7dc4b2e0f7b13fca3ee6aa8d34f9c1
RMD160 (simhv38-0.zip) = f1986d45f9b17a905957d1dca4eaa70098a7cae6
@@ -6,3 +6,4 @@ Size (simhv38-0.zip) = 2775593 bytes
SHA1 (patch-aa) = 427aa8eca1f1ac17f9279708e666d066b24dde7e
SHA1 (patch-ab) = 85b36e3d92a2bfbd886dbb2e08a0af967edeb0bd
SHA1 (patch-ac) = 78ecdc9abe248eb8c9a1dc3c297a4a7e5eb812d6
+SHA1 (patch-ad) = 4ab9108d50bc89b41aea3efdf58cc95089137937
diff --git a/emulators/simh/patches/patch-ad b/emulators/simh/patches/patch-ad
new file mode 100644
index 00000000000..6c09a775a99
--- /dev/null
+++ b/emulators/simh/patches/patch-ad
@@ -0,0 +1,25 @@
+$NetBSD: patch-ad,v 1.1 2008/11/20 21:30:05 chuck Exp $
+
+--- sim_defs.h.orig 2008-11-20 15:36:35.000000000 -0500
++++ sim_defs.h 2008-11-20 15:40:40.000000000 -0500
+@@ -164,7 +164,20 @@
+ /* Inlining */
+
+ #if defined (__GNUC__) /* GCC */
++
++#if defined(__APPLE_CC__) && (__APPLE_CC__ > 5400) && \
++ (__APPLE_CC__ < 5488) && (__STDC_VERSION__ >= 199901L) && \
++ !defined(__GNUC_STDC_INLINE__)
++/* old versions of xcode (3.0) don't define this, and they should... */
++#define __GNUC_STDC_INLINE__
++#endif
++
++#ifdef __GNUC_STDC_INLINE__
++#define SIM_INLINE extern inline
++#else
+ #define SIM_INLINE inline
++#endif
++
+ #elif defined (_MSC_VER) /* Microsoft C Compilers */
+ #define SIM_INLINE __inline
+ #else /* default */