pkgsrc/converters/libwps/patches/patch-aa

$NetBSD: patch-aa,v 1.1 2010/11/25 10:52:19 wiz Exp $

_U is defined in a NetBSD internal header.

--- src/conv/raw/RawListener.cpp.orig	2010-11-09 08:36:50.000000000 +0000
+++ src/conv/raw/RawListener.cpp
@@ -28,7 +28,7 @@
 #include <stdarg.h>
 #include "RawListener.h"
 
-#define _U(M, L) \
+#define _RLU(M, L) \
 	if (!m_printCallgraphScore) \
 			__iuprintf M; \
 	else \
@@ -148,7 +148,7 @@ void RawListenerImpl::setDocumentMetaDat
 
 void RawListenerImpl::startDocument()
 {
-	_U(("startDocument()\n"), LC_START_DOCUMENT);
+	_RLU(("startDocument()\n"), LC_START_DOCUMENT);
 }
 
 void RawListenerImpl::endDocument()
@@ -163,7 +163,7 @@ void RawListenerImpl::definePageStyle(co
 
 void RawListenerImpl::openPageSpan(const WPXPropertyList &propList)
 {
-	_U(("openPageSpan(%s)\n", getPropString(propList).cstr()),
+	_RLU(("openPageSpan(%s)\n", getPropString(propList).cstr()),
 	   LC_OPEN_PAGE_SPAN);
 }
 
@@ -175,7 +175,7 @@ void RawListenerImpl::closePageSpan()
 
 void RawListenerImpl::openHeader(const WPXPropertyList &propList)
 {
-	_U(("openHeader(%s)\n",
+	_RLU(("openHeader(%s)\n",
 	    getPropString(propList).cstr()),
 	   LC_OPEN_HEADER_FOOTER);
 }
@@ -188,7 +188,7 @@ void RawListenerImpl::closeHeader()
 
 void RawListenerImpl::openFooter(const WPXPropertyList &propList)
 {
-	_U(("openFooter(%s)\n",
+	_RLU(("openFooter(%s)\n",
 	    getPropString(propList).cstr()),
 	   LC_OPEN_HEADER_FOOTER);
 }
@@ -206,7 +206,7 @@ void RawListenerImpl::defineParagraphSty
 
 void RawListenerImpl::openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops)
 {
-	_U(("openParagraph(%s, tab-stops: %s)\n", getPropString(propList).cstr(), getPropString(tabStops).cstr()),
+	_RLU(("openParagraph(%s, tab-stops: %s)\n", getPropString(propList).cstr(), getPropString(tabStops).cstr()),
 	   LC_OPEN_PARAGRAPH);
 }
 
@@ -222,7 +222,7 @@ void RawListenerImpl::defineCharacterSty
 
 void RawListenerImpl::openSpan(const WPXPropertyList &propList)
 {
-	_U(("openSpan(%s)\n", getPropString(propList).cstr()), LC_OPEN_SPAN);
+	_RLU(("openSpan(%s)\n", getPropString(propList).cstr()), LC_OPEN_SPAN);
 }
 
 void RawListenerImpl::closeSpan()
@@ -237,7 +237,7 @@ void RawListenerImpl::defineSectionStyle
 
 void RawListenerImpl::openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns)
 {
-	_U(("openSection(%s, columns: %s)\n", getPropString(propList).cstr(), getPropString(columns).cstr()), LC_OPEN_SECTION);
+	_RLU(("openSection(%s, columns: %s)\n", getPropString(propList).cstr(), getPropString(columns).cstr()), LC_OPEN_SECTION);
 }
 
 void RawListenerImpl::closeSection()
@@ -283,13 +283,13 @@ void RawListenerImpl::defineUnorderedLis
 
 void RawListenerImpl::openOrderedListLevel(const WPXPropertyList &propList)
 {
-	_U(("openOrderedListLevel(%s)\n", getPropString(propList).cstr()),
+	_RLU(("openOrderedListLevel(%s)\n", getPropString(propList).cstr()),
 	   LC_OPEN_ORDERED_LIST_LEVEL);
 }
 
 void RawListenerImpl::openUnorderedListLevel(const WPXPropertyList &propList)
 {
-	_U(("openUnorderedListLevel(%s)\n", getPropString(propList).cstr()),
+	_RLU(("openUnorderedListLevel(%s)\n", getPropString(propList).cstr()),
 	   LC_OPEN_UNORDERED_LIST_LEVEL);
 }
 
@@ -306,7 +306,7 @@ void RawListenerImpl::closeUnorderedList
 
 void RawListenerImpl::openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops)
 {
-	_U(("openListElement(%s, tab-stops: %s)\n", getPropString(propList).cstr(), getPropString(tabStops).cstr()), 
+	_RLU(("openListElement(%s, tab-stops: %s)\n", getPropString(propList).cstr(), getPropString(tabStops).cstr()), 
 	   LC_OPEN_LIST_ELEMENT);
 }
 
@@ -317,7 +317,7 @@ void RawListenerImpl::closeListElement()
 
 void RawListenerImpl::openFootnote(const WPXPropertyList &propList)
 {
-	_U(("openFootnote(%s)\n", getPropString(propList).cstr()),
+	_RLU(("openFootnote(%s)\n", getPropString(propList).cstr()),
 	   LC_OPEN_FOOTNOTE);
 }
 
@@ -328,7 +328,7 @@ void RawListenerImpl::closeFootnote()
 
 void RawListenerImpl::openEndnote(const WPXPropertyList &propList)
 {
-	_U(("openEndnote(number: %s)\n", getPropString(propList).cstr()),
+	_RLU(("openEndnote(number: %s)\n", getPropString(propList).cstr()),
 	   LC_OPEN_ENDNOTE);
 }
 
@@ -339,7 +339,7 @@ void RawListenerImpl::closeEndnote()
 
 void RawListenerImpl::openComment(const WPXPropertyList &propList)
 {
-	_U(("openComment(%s)\n", getPropString(propList).cstr()),
+	_RLU(("openComment(%s)\n", getPropString(propList).cstr()),
 	   LC_OPEN_COMMENT);
 }
 
@@ -350,7 +350,7 @@ void RawListenerImpl::closeComment()
 
 void RawListenerImpl::openTextBox(const WPXPropertyList &propList)
 {
-	_U(("openTextBox(%s)\n", getPropString(propList).cstr()),
+	_RLU(("openTextBox(%s)\n", getPropString(propList).cstr()),
 	  LC_OPEN_TEXT_BOX);
 }
 
@@ -361,12 +361,12 @@ void RawListenerImpl::closeTextBox()
 	
 void RawListenerImpl::openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns)
 {
-	_U(("openTable(%s, columns: %s)\n", getPropString(propList).cstr(), getPropString(columns).cstr()), LC_OPEN_TABLE);
+	_RLU(("openTable(%s, columns: %s)\n", getPropString(propList).cstr(), getPropString(columns).cstr()), LC_OPEN_TABLE);
 }
 
 void RawListenerImpl::openTableRow(const WPXPropertyList &propList)
 {
-	_U(("openTableRow(%s)\n", getPropString(propList).cstr()),
+	_RLU(("openTableRow(%s)\n", getPropString(propList).cstr()),
 	   LC_OPEN_TABLE_ROW);
 }
 
@@ -377,7 +377,7 @@ void RawListenerImpl::closeTableRow()
 
 void RawListenerImpl::openTableCell(const WPXPropertyList &propList)
 {
-	_U(("openTableCell(%s)\n", getPropString(propList).cstr()),
+	_RLU(("openTableCell(%s)\n", getPropString(propList).cstr()),
 	   LC_OPEN_TABLE_CELL);
 }
 
@@ -398,7 +398,7 @@ void RawListenerImpl::closeTable()
 
 void RawListenerImpl::openFrame(const WPXPropertyList &propList)
 {
-	_U(("openFrame(%s)\n", getPropString(propList).cstr()),
+	_RLU(("openFrame(%s)\n", getPropString(propList).cstr()),
 	  LC_OPEN_FRAME);
 }