From 5baa4bf2b2a0e3b898cd124dc479b3de5b4d0b94 Mon Sep 17 00:00:00 2001
From: Martin Blapp <mbr@FreeBSD.org>
Date: Mon, 4 Nov 2002 06:15:37 +0000
Subject: Commit first part of bison 1.75 patches.

Tested by:	various openoffice users
---
 .../files/patch-idlc+source+parser.y               | 36 ++++++++++++++++++++++
 .../files/patch-nas+nas-1.4.1.patch                | 31 +++++++++++--------
 2 files changed, 55 insertions(+), 12 deletions(-)
 create mode 100644 editors/openoffice.org-2/files/patch-idlc+source+parser.y

(limited to 'editors/openoffice.org-2')

diff --git a/editors/openoffice.org-2/files/patch-idlc+source+parser.y b/editors/openoffice.org-2/files/patch-idlc+source+parser.y
new file mode 100644
index 000000000000..69285ef67bdd
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-idlc+source+parser.y
@@ -0,0 +1,36 @@
+--- ../idlc/source/parser.y.orig	Wed Jul 10 11:43:18 2002
++++ ../idlc/source/parser.y	Thu Oct 31 10:00:47 2002
+@@ -995,7 +995,8 @@
+ 	{
+ 		idlc()->setParseState(PS_ConstantDeclSeen);
+ 	}
+-	';'
++	';' {};
++
+ 
+ const_dcl : 
+ 	IDL_CONST
+@@ -1316,7 +1317,7 @@
+ 		 * Push the scope of the exception on the scopes stack
+ 		 */
+ 		idlc()->scopes()->push(pExcept);
+-		delete $1
++		delete $1;
+ 	}
+ 	'{'
+ 	{
+@@ -1705,10 +1706,10 @@
+ 	{
+ 		idlc()->setParseState(PS_TypedefSeen);
+ 	}
+-	type_declarator
+-	| struct_type
+-	| union_type
+-	| enum_type
++	type_declarator {}
++	| struct_type {}
++	| union_type {}
++	| enum_type {}
+ 	;
+ 
+ type_declarator :
diff --git a/editors/openoffice.org-2/files/patch-nas+nas-1.4.1.patch b/editors/openoffice.org-2/files/patch-nas+nas-1.4.1.patch
index 8623e0bd5892..cde27322f62f 100644
--- a/editors/openoffice.org-2/files/patch-nas+nas-1.4.1.patch
+++ b/editors/openoffice.org-2/files/patch-nas+nas-1.4.1.patch
@@ -1,6 +1,6 @@
 --- ../nas/nas-1.4.1.patch.orig	Thu Nov  1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch	Thu Aug  8 16:47:25 2002
-@@ -120,26 +120,139 @@
++++ ../nas/nas-1.4.1.patch	Thu Oct 31 10:17:40 2002
+@@ -120,26 +120,157 @@
    	    return(-1);
    	}
    
@@ -163,14 +163,21 @@
 +-#define NasConfigSearchPath /etc/nas/
 ++#define NasConfigSearchPath $(PROJECTROOT)/etc/
 + #endif
-+--- misc/nas-1.4.1/server/os/utils.c.orig	Tue Jul 23 23:48:23 2002
-++++ misc/build/nas-1.4.1/server/os/utils.c	Tue Jul 23 23:49:06 2002
-+@@ -120,7 +120,7 @@
-+ 
-+ void ddxUseMsg(void);
-+ 
-+-#if !defined(SVR4) && !defined(hpux) && !defined(linux) && !defined(AMOEBA) && !defined(_MINIX)
-++#if !defined(SVR4) && !defined(hpux) && !defined(linux) && !defined(AMOEBA) && !defined(_MINIX) && !defined(__FreeBSD__)
-+ extern char *sbrk();
-+ #endif
++--- misc/nas-1.4.1/server/dia/gram.y.orig	Thu Oct 31 10:13:28 2002
+++++ misc/build/nas-1.4.1/server/dia/gram.y	Thu Oct 31 10:15:18 2002
++@@ -120,13 +120,13 @@
++ 		| MAXRATE number
++ 			{ ddaSetConfig(MAXRATE, (void *)$2); }
++ 		| MINRATE number
++-			{ ddaSetConfig(MINRATE, (void *)$2); }
+++			{ ddaSetConfig(MINRATE, (void *)$2); };
++ 
++ string		: STRING		{ ptr = (char *)malloc(strlen($1)+1);
++ 					  strcpy(ptr, $1);
++ 					  RemoveDQuote(ptr);
++ 					  $$ = ptr;
++-					}
+++					};
++ number		: NUMBER		{ $$ = $1; }
++ 		;
 + 
-- 
cgit v1.2.3