Explorar o código

make sure one can include <libxml/hash.h> without problems

Ralf S. Engelschall %!s(int64=22) %!d(string=hai) anos
pai
achega
8bc5759101
Modificáronse 2 ficheiros con 34 adicións e 3 borrados
  1. 33 2
      libxml/libxml.patch
  2. 1 1
      libxml/libxml.spec

+ 33 - 2
libxml/libxml.patch

@@ -1,6 +1,37 @@
+Index: include/libxml/hash.h
+--- include/libxml/hash.h.orig	2003-09-09 22:18:00.000000000 +0200
++++ include/libxml/hash.h	2003-11-28 20:19:02.000000000 +0100
+@@ -18,9 +18,6 @@
+ #ifndef __XML_HASH_H__
+ #define __XML_HASH_H__
+ 
+-#include <libxml/xmlversion.h>
+-#include <libxml/parser.h>
+-
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -31,6 +28,17 @@
+ typedef struct _xmlHashTable xmlHashTable;
+ typedef xmlHashTable *xmlHashTablePtr;
+ 
++#ifdef __cplusplus
++}
++#endif
++
++#include <libxml/xmlversion.h>
++#include <libxml/parser.h>
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /*
+  * function types:
+  */
 Index: nanoftp.c
---- nanoftp.c.orig	2003-10-10 17:49:38.000000000 +0200
-+++ nanoftp.c	2003-10-22 20:55:34.000000000 +0200
+--- nanoftp.c.orig	2003-10-29 14:27:37.000000000 +0100
++++ nanoftp.c	2003-11-28 20:18:23.000000000 +0100
 @@ -1553,7 +1553,7 @@
  
      memset (&dataAddr, 0, sizeof(dataAddr));

+ 1 - 1
libxml/libxml.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [BASE]
 Group:        SGML
 License:      LGPL
 Version:      2.6.2
-Release:      20031104
+Release:      20031128
 
 #   list of sources
 Source0:      ftp://xmlsoft.org/libxml2-%{version}.tar.gz