INTEGRATION: CWS pchfix04 (1.204.30); FILE MERGED

2007/04/25 20:47:15 hjs 1.204.30.5: RESYNC: (1.209-1.211); FILE MERGED
2007/02/13 15:22:54 hjs 1.204.30.4: RESYNC: (1.208-1.209); FILE MERGED
2007/01/26 19:09:05 hjs 1.204.30.3: RESYNC: (1.205-1.208); FILE MERGED
2006/12/11 14:18:10 kaib 1.204.30.2: RESYNC: (1.204-1.205); FILE MERGED
2006/11/15 20:48:13 mkretzschmar 1.204.30.1: #i71588# Preparatory cleanups for PCH support on GCC

solenv/inc/settings.mk

@@ -4,9 +4,9 @@
 #
 #   $RCSfile: settings.mk,v $
 #
-#   $Revision: 1.213 $
+#   $Revision: 1.214 $
 #
-#   last change: $Author: kz $ $Date: 2007-05-09 13:26:32 $
+#   last change: $Author: kz $ $Date: 2007-05-10 15:11:02 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -1097,8 +1097,8 @@ CFLAGS+=$(CFLAGSNOOPT)
 GLOBAL_EXCEPTIONS_FLAGS+=$(CFLAGSEXCEPTIONS)
 GLOBAL_EXCEPTIONS_FLAGS+=-DEXCEPTIONS_ON
 .ELSE
-GLOBAL_EXCEPTIONS_FLAGS+=-DEXCEPTIONS_OFF
 GLOBAL_EXCEPTIONS_FLAGS+=$(CFLAGS_NO_EXCEPTIONS)
+GLOBAL_EXCEPTIONS_FLAGS+=-DEXCEPTIONS_OFF
 .ENDIF
 # used if an object appears in the EXCEPTIONSFILES list
 # see also rules.mk