From 0b2a4f005b0569fe7f626f19b362578a9633e63f Mon Sep 17 00:00:00 2001
From: dholland <dholland>
Date: Mon, 12 Sep 2011 04:46:54 +0000
Subject: Disable inline by always #defining it to nothing. What motivates
 people to declare functions inline without making any kind of inline
 definition available?

---
 archivers/hpack/distinfo         |  4 ++--
 archivers/hpack/patches/patch-aa | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'archivers/hpack')

diff --git a/archivers/hpack/distinfo b/archivers/hpack/distinfo
index 9a57c8b203a..d28775a2852 100644
--- a/archivers/hpack/distinfo
+++ b/archivers/hpack/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2005/10/03 11:18:40 joerg Exp $
+$NetBSD: distinfo,v 1.11 2011/09/12 04:46:54 dholland Exp $
 
 SHA1 (hpack-0.79/hpack79src.tar.gz) = cbfd755f1c4fcc4ecf8cd8be476db98e31dede1a
 RMD160 (hpack-0.79/hpack79src.tar.gz) = fcd1265ff858dcca3090bdede86e90da293cf3a2
 Size (hpack-0.79/hpack79src.tar.gz) = 545648 bytes
-SHA1 (patch-aa) = d39d13ee6f99eb71ac3129c24942bf02d2527e1f
+SHA1 (patch-aa) = 97cfb7de5acd8f6171a461b818d3ad4f1e8b181e
 SHA1 (patch-ab) = 48fa56d17725d2b3de87955f09d82624d14e2f56
 SHA1 (patch-ac) = cf399b72c990fc2a6583ab0abbb252075c2ceceb
 SHA1 (patch-ad) = c07f5d0ec7e2dd18d518d5eafe64ff0ef9e81a91
diff --git a/archivers/hpack/patches/patch-aa b/archivers/hpack/patches/patch-aa
index 21335c83d50..b23e91b21e1 100644
--- a/archivers/hpack/patches/patch-aa
+++ b/archivers/hpack/patches/patch-aa
@@ -1,7 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/05/23 22:41:21 tv Exp $
+$NetBSD: patch-aa,v 1.2 2011/09/12 04:46:54 dholland Exp $
 
---- defs.h.orig	Sun May 23 17:31:43 1999
-+++ defs.h	Sun May 23 17:26:19 1999
+- quick and dirty LP64 fix: "unsigned" is more often 32-bit than
+"unsigned long" is.
+
+- disable inline unconditionally as the code in the package completely
+misuses it.
+
+--- defs.h.orig	1993-05-31 15:17:00.000000000 +0000
++++ defs.h
 @@ -20,7 +20,7 @@
  typedef unsigned char		BYTE;
  typedef unsigned short int	WORD;	/* 16-bit unsigned on most systems */
@@ -11,12 +17,12 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/05/23 22:41:21 tv Exp $
  #endif /* _OS2EMX.H */
  
  typedef int		BOOLEAN;
-@@ -43,7 +43,7 @@
+@@ -43,7 +43,7 @@ typedef int		BOOLEAN;
  
  /* 'inline' patch for compilers which can't handle this */
  
 -#if !( defined( __CPLUSPLUS__ ) || defined( __cplusplus ) ) || defined( __TSC__ )
-+#if !( defined( __GNUC__ ) || defined( __CPLUSPLUS__ ) || defined( __cplusplus ) ) || defined( __TSC__ )
++#if 1
    #define inline
  #endif /* !( __CPLUSPLUS__ || __cplusplus ) */
  
-- 
cgit v1.2.3