summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjschauma <jschauma@pkgsrc.org>2003-09-15 15:02:54 +0000
committerjschauma <jschauma@pkgsrc.org>2003-09-15 15:02:54 +0000
commit0b5fd94a43b4df78f35793eb56916a66d16ee84c (patch)
tree79bf2197db7d7420a048e83695e6bfb6fd9dae32
parent6fd43e41301fcdb49dc5f27c2a0d1d6e2bb67749 (diff)
downloadpkgsrc-0b5fd94a43b4df78f35793eb56916a66d16ee84c.tar.gz
Get rid of the 'extern __inline__' nonsense, thus allowing this to
compile with non-gcc compilers. Ok jlam@.
-rw-r--r--misc/dialog/distinfo4
-rw-r--r--misc/dialog/patches/patch-ac49
2 files changed, 42 insertions, 11 deletions
diff --git a/misc/dialog/distinfo b/misc/dialog/distinfo
index fdc6b98b114..d85733444fc 100644
--- a/misc/dialog/distinfo
+++ b/misc/dialog/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2001/06/19 15:53:11 jlam Exp $
+$NetBSD: distinfo,v 1.4 2003/09/15 15:02:54 jschauma Exp $
SHA1 (dialog-0.6z.tar.gz) = 3c9483554bbb63bb8838e1f7b31f2600a33198ad
Size (dialog-0.6z.tar.gz) = 50901 bytes
SHA1 (patch-aa) = 267ffec46c4c7ae070df8eb78ac7db77310a2bad
SHA1 (patch-ab) = 39318c50019277ffa1cecdb33f16e16c11ad37af
-SHA1 (patch-ac) = 6179f418b01a778fedf16d0885e420a96dd604a4
+SHA1 (patch-ac) = 5862dd0163f2979b8071d8dbc6388c466a162042
SHA1 (patch-ad) = 90a88a838923423cfe3bdbfc5d9de6d40bd10cee
SHA1 (patch-ae) = c0aae5c99837a17919fea47734d90fb6006dd381
SHA1 (patch-af) = 4b47fa64e73deca0bb69ad1bc83102e46eaa01fe
diff --git a/misc/dialog/patches/patch-ac b/misc/dialog/patches/patch-ac
index bf4b10d5914..b8b08e7fb1d 100644
--- a/misc/dialog/patches/patch-ac
+++ b/misc/dialog/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.7 2001/06/19 15:53:11 jlam Exp $
+$NetBSD: patch-ac,v 1.8 2003/09/15 15:02:55 jschauma Exp $
---- dialog.h.orig Fri Aug 18 07:35:06 1995
-+++ dialog.h
+--- dialog.h.orig 1995-08-18 07:35:06.000000000 -0400
++++ dialog.h 2003-09-14 21:47:41.000000000 -0400
@@ -28,7 +28,7 @@
#ifdef ultrix
#include <cursesX.h>
@@ -29,11 +29,42 @@ $NetBSD: patch-ac,v 1.7 2001/06/19 15:53:11 jlam Exp $
int dialog_yesno (const char *title, const char *prompt, int height, int width);
int dialog_msgbox (const char *title, const char *prompt, int height,
int width, int pause);
-@@ -196,6 +200,7 @@
- extern __inline__ int
- mouse_wgetch (WINDOW * win)
- {
-+return 0;
- };
+@@ -171,33 +175,11 @@
+ */
+ #ifndef HAVE_LIBGPM
+-extern __inline__ void
+-mouse_open (void)
+-{
+-};
+-extern __inline__ void
+-mouse_close (void)
+-{
+-};
+-extern __inline__ void
+-mouse_mkregion (int y, int x, int height, int width,
+- int code)
+-{
+-};
+-extern __inline__ void
+-mouse_mkbigregion (int y, int x, int height, int width,
+- int nitems, int th, int mode)
+-{
+-};
+-extern __inline__ void
+-mouse_setbase (int x, int y)
+-{
+-};
+-extern __inline__ int
+-mouse_wgetch (WINDOW * win)
+-{
+-};
+-
++#define mouse_open() {}
++#define mouse_close() {}
++#define mouse_mkregion(y, x, height, width, code) {}
++#define mouse_mkbigregion(y, x, height, width, nitems, th, mode) {}
++#define mouse_setbase(x, y) {}
#define mouse_wgetch(w) wgetch(w)
+
+ #else