[packages/rpm/rpm-4_5] forward-declare delMacroAll

[glen]

commit 565fe965b55790cac91411008a71276617d40c34
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Nov 8 06:45:56 2012 +0200

    forward-declare delMacroAll
    
    somewhy build on ac started to complain and that errored out:
    
    amd64-pld-linux-gcc -DHAVE_CONFIG_H -I. -I.. -I. -I.. -I/usr/include/beecrypt -I../lua/include -I../lua/local -I../misc -I/usr/include/ossp-uuid -I/usr/include/db4.5 -O2 -fno-strict-aliasing -gdwarf-2 -g2 -fPIC -DPIC -D_GNU_SOURCE -D_REENTRANT -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts -MT macro.lo -MD -MP -MF .deps/macro.Tpo -c macro.c  -fPIC -DPIC -o .libs/macro.o
    macro.c: In function `doUnglobal':
    macro.c:840: warning: implicit declaration of function `delMacroAll'
    macro.c: At top level:
    macro.c:2028: warning: no previous prototype for 'delMacroAll'
    macro.c:2028: error: conflicting types for 'delMacroAll'
    macro.c:840: error: previous implicit declaration of 'delMacroAll' was here
    make[2]: *** [macro.lo] Error 1

 rpm-unglobal.patch | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/rpm-unglobal.patch b/rpm-unglobal.patch
index 7dbbcb5..965e983 100644
--- a/rpm-unglobal.patch
+++ b/rpm-unglobal.patch
@@ -1,9 +1,10 @@
---- rpm-4.5/rpmio/macro.c.org	2009-08-08 15:42:25.574860247 +0200
-+++ rpm-4.5/rpmio/macro.c	2009-08-08 15:47:20.495455961 +0200
-@@ -807,6 +807,41 @@
+--- rpm-4.5/rpmio/macro.c	2009-08-08 15:47:20.495455961 +0200
++++ rpm-4.5/rpmio/macro.c	2012-11-08 06:37:45.082618600 +0200
+@@ -807,6 +807,42 @@
      return se;
  }
  
++void delMacroAll(MacroContext mc, const char * n);
 +/**
 + * Parse (and execute) macro undefinition.
 + * @param mc		macro context
@@ -42,7 +43,7 @@
  #ifdef	DYING
  static void
  dumpME(const char * msg, MacroEntry me)
-@@ -1430,6 +1465,10 @@
+@@ -1430,6 +1466,10 @@
  		s = doUndefine(mb->mc, se);
  		continue;
  	}
@@ -53,7 +54,7 @@
  
  	if (STREQ("echo", f, fn) ||
  	    STREQ("warn", f, fn) ||
-@@ -1984,6 +2023,18 @@
+@@ -1984,6 +2024,18 @@
      }
  }
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/565fe965b55790cac91411008a71276617d40c34