summaryrefslogtreecommitdiff
path: root/solenv/inc/unxbsdi.mk
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-09-09 10:15:14 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-09-09 10:15:14 +0000
commit3334f4220ddef771d145b9f486e9db2db07ba321 (patch)
treebe486ff88b1552b18c8f0036425f1a855cd341ee /solenv/inc/unxbsdi.mk
parent5d98c4da774578bcfcbe6aa35ed65864bb7743cc (diff)
INTEGRATION: CWS ooo20040815 (1.6.130); FILE MERGED
2004/07/28 10:29:29 waratah 1.6.130.1: Remove -fno-for-scope and -fpermissive from all parameters
Diffstat (limited to 'solenv/inc/unxbsdi.mk')
-rw-r--r--solenv/inc/unxbsdi.mk7
1 files changed, 3 insertions, 4 deletions
diff --git a/solenv/inc/unxbsdi.mk b/solenv/inc/unxbsdi.mk
index b20d573e40f3..0f12db4dd5c5 100644
--- a/solenv/inc/unxbsdi.mk
+++ b/solenv/inc/unxbsdi.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: unxbsdi.mk,v $
#
-# $Revision: 1.6 $
+# $Revision: 1.7 $
#
-# last change: $Author: vg $ $Date: 2003-12-17 18:07:25 $
+# last change: $Author: hr $ $Date: 2004-09-09 11:15:14 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -97,8 +97,7 @@ CFLAGSEXCEPTIONS=-fexceptions
# Flags for disabling exception handling
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-# -fpermissive should be removed as soon as possible
-CFLAGSCXX= -pipe -mpentiumpro -fno-for-scope -fpermissive -frtti
+CFLAGSCXX= -pipe -mpentiumpro -frtti
# Compiler flags for compiling static object in single threaded environment with graphical user interface
CFLAGSOBJGUIST=