add back needed patch. remove obsolete patch

This commit is contained in:
Rahul Sundaram 2013-02-09 01:24:19 -05:00
parent a3f9555026
commit df63bc6941
2 changed files with 13 additions and 26 deletions

View File

@ -0,0 +1,13 @@
diff -u -r abiword-2.6.0.orig/src/text/ptbl/xp/pd_Style.h abiword-2.6.0/src/text/ptbl/xp/pd_Style.h
--- abiword-2.6.0.orig/src/text/ptbl/xp/pd_Style.h 2008-03-18 23:16:20.000000000 +0100
+++ abiword-2.6.0/src/text/ptbl/xp/pd_Style.h 2008-03-25 17:14:23.000000000 +0100
@@ -23,6 +23,9 @@
#ifndef PD_STYLE_H
#define PD_STYLE_H
+#ifndef FALSE
+#define FALSE 0
+#endif /* FALSE */
#include "ut_types.h"
#include "pt_Types.h"
#include "ut_xml.h"

View File

@ -1,26 +0,0 @@
diff -u -r abiword-plugins-2.6.0.orig/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h abiword-plugins-2.6.0/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h
--- abiword-plugins-2.6.0.orig/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h 2008-03-18 23:18:02.000000000 +0100
+++ abiword-plugins-2.6.0/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h 2008-03-25 17:16:04.000000000 +0100
@@ -20,6 +20,9 @@
#ifndef __LinkGrammarWrap_h__
#define __LinkGrammarWrap_h__
+#ifndef TRUE
+#define TRUE 1
+#endif /* TRUE */
extern "C" {
#include <link-grammar/link-includes.h>
}
diff -u -r abiword-plugins-2.6.0.orig/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h abiword-plugins-2.6.0/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h
--- abiword-plugins-2.6.0.orig/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h 2008-03-18 23:18:20.000000000 +0100
+++ abiword-plugins-2.6.0/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h 2008-03-25 17:16:04.000000000 +0100
@@ -23,6 +23,9 @@
#ifndef _ODI_STYLE_STYLE_H_
#define _ODI_STYLE_STYLE_H_
+#ifndef TRUE
+#define TRUE 1
+#endif /* TRUE */
// Internal includes
#include "ODi_ListenerState.h"