? .DS_Store
? bmpmaker/bmpmaker..dpr
Index: inc/nranges.hxx
===================================================================
RCS file: /cvs/util/svtools/inc/nranges.hxx,v
retrieving revision 1.5
diff -u -r1.5 nranges.hxx
--- inc/nranges.hxx	13 May 2003 12:31:46 -0000	1.5
+++ inc/nranges.hxx	15 Jul 2003 19:46:47 -0000
@@ -58,7 +58,7 @@
  *
  *
  ************************************************************************/
-#ifdef MACOSX
+#if defined(MACOSX) && (__GNUC__ < 3)
 // We need an empty block in here. Otherwise, if the #ifndef _SFXNRANGES_HXX
 // line is the first line, the Mac OS X version of the gcc preprocessor will
 // incorrectly optimize the inclusion process and will never include this file
Index: inc/rngitem.hxx
===================================================================
RCS file: /cvs/util/svtools/inc/rngitem.hxx,v
retrieving revision 1.5
diff -u -r1.5 rngitem.hxx
--- inc/rngitem.hxx	13 May 2001 03:25:17 -0000	1.5
+++ inc/rngitem.hxx	15 Jul 2003 19:46:47 -0000
@@ -58,7 +58,7 @@
  *
  *
  ************************************************************************/
-#ifdef MACOSX
+#if defined(MACOSX) && ( __GNUC__ < 3 )
 // We need an empty block in here. Otherwise, if the #ifndef _SFXRNGITEM_HXX
 // line is the first line, the Mac OS X version of the gcc preprocessor will
 // incorrectly optimize the inclusion process and will never include this file
Index: source/contnr/makefile.mk
===================================================================
RCS file: /cvs/util/svtools/source/contnr/makefile.mk,v
retrieving revision 1.5
diff -u -r1.5 makefile.mk
--- source/contnr/makefile.mk	2 Oct 2002 14:36:02 -0000	1.5
+++ source/contnr/makefile.mk	15 Jul 2003 19:46:47 -0000
@@ -106,16 +106,22 @@
 			$(SLO)$/svimpbox.obj	\
 			$(SLO)$/svlbitm.obj		\
 			$(SLO)$/svtreebx.obj	\
+			$(SLO)$/fileview.obj	\
 			$(SLO)$/imivctl1.obj	\
 			$(SLO)$/imivctl2.obj	\
 			$(SLO)$/ivctrl.obj		\
-			$(SLO)$/fileview.obj	\
 			$(SLO)$/templwin.obj	\
 			$(SLO)$/tooltiplbox.obj
 
 EXCEPTIONSFILES=\
 			$(SLO)$/fileview.obj	\
 			$(SLO)$/templwin.obj
+
+.IF "$(OS)"=="MACOSX"
+EXCEPTIONSFILES +=  $(SLO)$/imivctl1.obj	\
+				$(SLO)$/imivctl2.obj	\
+				$(SLO)$/ivctrl.obj
+.ENDIF
 
 # Fuer das Setup bauen wir noch mal statisch
 .IF "$(VCSID)" != "OV"