From b33ae7fc706c6f9a8130e34d5eafb0ffbf938905 Mon Sep 17 00:00:00 2001
From: Takeshi Abe <tabe@fixedpoint.jp>
Date: Sat, 18 Jun 2011 00:00:52 +0900
Subject: remove dead code

---
 regexp/source/reclass.cxx | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'regexp/source')

diff --git a/regexp/source/reclass.cxx b/regexp/source/reclass.cxx
index 79457e6c1fd3..b296230ead9f 100644
--- a/regexp/source/reclass.cxx
+++ b/regexp/source/reclass.cxx
@@ -1362,13 +1362,6 @@ Regexpr::regex_compile()
       case (sal_Unicode)')':
     goto normal_backslash;
 
-    // unreachable (after goto):
-#if 0
-    if (COMPILE_STACK_EMPTY) {
-      FREE_STACK_RETURN(REG_ERPAREN);
-    }
-#endif
-
       handle_close:
     if (fixup_alt_jump) {
       /* Push a dummy failure point at the end of the
-- 
cgit 


From 62467741ecf1360cfe89c656c9310feab530ae44 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@novell.com>
Date: Tue, 21 Jun 2011 02:29:08 +0300
Subject: Use the import library name that i18npool expects with MinGW

---
 regexp/source/makefile.mk | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'regexp/source')

diff --git a/regexp/source/makefile.mk b/regexp/source/makefile.mk
index 7aa2a2eaa03b..b1ebf69224cf 100644
--- a/regexp/source/makefile.mk
+++ b/regexp/source/makefile.mk
@@ -44,7 +44,11 @@ SLOFILES= \
         $(EXCEPTIONSFILES)
 
 SHL1TARGET=		$(TARGET)$(COMID)
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB=     i$(TARGET)
+.ELSE
+SHL1IMPLIB =    $(TARGET)$(COMID)
+.ENDIF
 DEF1DEPN=		$(MISC)$/$(SHL1TARGET).flt
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=		$(SHL1TARGET)
-- 
cgit