From: Ken Raeburn <raeburn@mit.edu>
Date: Mon, 3 Nov 2008 20:50:42 +0000 (+0000)
Subject: Fix conditionals from last change
X-Git-Tag: krb5-1.7-alpha1~234
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=361f491af705254ca778dc290e24d72cd2add4fd;p=krb5.git

Fix conditionals from last change

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20960 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/asn.1/asn1buf.c b/src/lib/krb5/asn.1/asn1buf.c
index 29a3f5c55..b8efabaca 100644
--- a/src/lib/krb5/asn.1/asn1buf.c
+++ b/src/lib/krb5/asn.1/asn1buf.c
@@ -55,7 +55,7 @@
 #include <stdio.h>
 #include "asn1_get.h"
 
-#if !((__GNUC__ >= 2) && !defined(ASN1BUF_OMIT_INLINE_FUNCS)) || defined(CONFIG_SMALL)
+#if !defined(__GNUC__) || defined(CONFIG_SMALL)
 /* Declare private procedures as static if they're not used for inline
    expansion of other stuff elsewhere.  */
 static unsigned int asn1buf_free(const asn1buf *);
diff --git a/src/lib/krb5/asn.1/asn1buf.h b/src/lib/krb5/asn.1/asn1buf.h
index 1e40cae7b..874d6db5c 100644
--- a/src/lib/krb5/asn.1/asn1buf.h
+++ b/src/lib/krb5/asn.1/asn1buf.h
@@ -13,7 +13,7 @@ typedef struct code_buffer_rep {
 
 /**************** Private Procedures ****************/
 
-#if ((__GNUC__ >= 2) && !defined(ASN1BUF_OMIT_INLINE_FUNCS)) && !defined(CONFIG_SMALL)
+#if (__GNUC__ >= 2) && !defined(CONFIG_SMALL)
 unsigned int asn1buf_free
         (const asn1buf *buf);
 /* requires  *buf is allocated