Remove any putc macro before defining a putc member function.

Should fix (or advance) dfly build.

4 files changed, 34 insertions, 2 deletions

diff --git a/emulators/gpsim-devel/distinfo b/emulators/gpsim-devel/distinfo
index 17a97679c52..e41e9ff26b2 100644
--- a/emulators/gpsim-devel/distinfo
+++ b/emulators/gpsim-devel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2012/10/20 22:09:09 joerg Exp $
+$NetBSD: distinfo,v 1.11 2012/12/24 06:11:25 dholland Exp $
 
 SHA1 (gpsim-20050905.tar.gz) = 46e7d0d69695961aca4324d8d3267181bd641081
 RMD160 (gpsim-20050905.tar.gz) = 1b717f0e51440c4e2db72a4bdfb90d2e8d5e4a3d
@@ -29,6 +29,7 @@ SHA1 (patch-src_operator.cc) = 4bdb1cee156930fb817ddff3e0eda6b49731872e
 SHA1 (patch-src_processor.cc) = 5139b24bf928c98250c9a87981b9ee0070f65949
 SHA1 (patch-src_processor.h) = 48ad5c1318e5b1e096643cd714cbb3ff3ce57db3
 SHA1 (patch-src_program__files.cc) = db0b4561d20f6b1feabeb33847f22326455608da
+SHA1 (patch-src_protocol.h) = ed2c7c903ed605b26a50c125436ac18f11d824eb
 SHA1 (patch-src_symbol.cc) = 195c15f4c258398d4a7c28cee1cf3d3ad7164429
 SHA1 (patch-src_symbol.h) = 778f2b9f8febfa498b87acfb59fdcb665975e592
 SHA1 (patch-src_value.cc) = 3fceae8b4d40ad1c26a06ac7dce6bb88965ae018
diff --git a/emulators/gpsim-devel/patches/patch-src_protocol.h b/emulators/gpsim-devel/patches/patch-src_protocol.h
new file mode 100644
index 00000000000..12ba9dc9df7
--- /dev/null
+++ b/emulators/gpsim-devel/patches/patch-src_protocol.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_protocol.h,v 1.1 2012/12/24 06:11:26 dholland Exp $
+
+Remove any putc macro before defining a putc member function.
+Required for building on DragonFly.
+
+--- src/protocol.h~	2005-08-25 21:57:44.000000000 +0000
++++ src/protocol.h
+@@ -101,6 +101,7 @@ public:
+ 
+   void terminate();
+ 
++#undef putc /* in case it's a macro coming from stdio.h */
+   void putc(char c)
+   {
+     if(index < size)
diff --git a/emulators/gpsim/distinfo b/emulators/gpsim/distinfo
index e84328ed5bb..c5f35581da5 100644
--- a/emulators/gpsim/distinfo
+++ b/emulators/gpsim/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2012/05/10 06:52:52 dholland Exp $
+$NetBSD: distinfo,v 1.12 2012/12/24 06:08:29 dholland Exp $
 
 SHA1 (gpsim-0.21.11.tar.gz) = 05337560a6b48a9afb7a3f4be1ba606709f6b30a
 RMD160 (gpsim-0.21.11.tar.gz) = 36001180948fc2394043d8283dc1dd028ee4f922
@@ -26,5 +26,6 @@ SHA1 (patch-src_operator.cc) = 303dd4744aabc3a42fa97db3d3bebc3994c80e8a
 SHA1 (patch-src_processor.cc) = b77bc4710c14fd519dd5b72e0700172c9b2dc02e
 SHA1 (patch-src_processor.h) = 29cd80b086f7267c7d092e22d9f5780310d8d006
 SHA1 (patch-src_program__files.cc) = 25e3b4ee2e8ad91eaa54a64d7ccc2f1ff51b51a9
+SHA1 (patch-src_protocol.h) = ed2c7c903ed605b26a50c125436ac18f11d824eb
 SHA1 (patch-src_symbol.cc) = cb84a108f2a79a1d3eb40da33cd11f3276682bc0
 SHA1 (patch-src_value.cc) = 8a97172012cccb14c7b4654e4da1b60041b7733f
diff --git a/emulators/gpsim/patches/patch-src_protocol.h b/emulators/gpsim/patches/patch-src_protocol.h
new file mode 100644
index 00000000000..2aebfad3fd7
--- /dev/null
+++ b/emulators/gpsim/patches/patch-src_protocol.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_protocol.h,v 1.1 2012/12/24 06:08:30 dholland Exp $
+
+Remove any putc macro before defining a putc member function.
+Required for building on DragonFly.
+
+--- src/protocol.h~	2005-08-25 21:57:44.000000000 +0000
++++ src/protocol.h
+@@ -101,6 +101,7 @@ public:
+ 
+   void terminate();
+ 
++#undef putc /* in case it's a macro coming from stdio.h */
+   void putc(char c)
+   {
+     if(index < size)