Am Samstag, 14. Oktober 2006 02:35 schrieb Timothy Reaves: > g++-4 -DHAVE_CONFIG_H -I. -I. -I../../../src -DQT_CLEAN_NAMESPACE > -DQT_GENUINE_STR -DQT_NO_STL -DQT_NO_KEYWORDS -Winvalid-pch > --include=./pch.h -I../../../src -I../../../src/frontends > -I../../../images -I/usr/local/Trolltech/Qt-4.2.0/include > -I/usr/local/Trolltech/Qt-4.2.0/include/QtCore > -I/usr/local/Trolltech/Qt-4.2.0/include/QtGui -I../../../boost > -I../../../src/frontends/controllers -Wextra -Wall -I/sw/include -g -Os > -MT GuiApplication.lo -MD -MP -MF .deps/GuiApplication.Tpo -c > GuiApplication.C -o GuiApplication.o > In file included from ../../../src/BufferView.h:18, > from GuiApplication.C:27: > ../../../src/coordcache.h:59:19: error: macro "check" passed 2 > arguments, but takes just 1 > ../../../src/coordcache.h:65:19: error: macro "check" passed 2 > arguments, but takes just 1 > ../../../src/coordcache.h:71:20: error: macro "check" passed 2 > arguments, but takes just 1 > ../../../src/coordcache.h:89:47: error: macro "check" passed 2 > arguments, but takes just 1 > ../../../src/coordcache.h:27: error: redefinition of 'class Point' > /System/Library/Frameworks/CoreServices.framework/Headers/../Frameworks/CarbonCore.framework/Headers/MacTypes.h:485: >
Does this patch fix it? You should complain to apple that they define a check() macro, that is calling for problems. BTW the Point class in coordcache.h should be in a lyx namespace. Georg
Index: src/frontends/qt4/GuiApplication.C =================================================================== --- src/frontends/qt4/GuiApplication.C (Revision 15327) +++ src/frontends/qt4/GuiApplication.C (Arbeitskopie) @@ -14,6 +14,10 @@ #include "GuiApplication.h" +// This must be included before all qt stuff, since on OS X some qt header +// pulls in a macro check(), and we have a check() method in coordcache.h. +#include "BufferView.h" + #include "qt_helpers.h" #include "QLImage.h" #include "socket_callback.h" @@ -24,7 +28,6 @@ #include "support/os.h" #include "support/package.h" -#include "BufferView.h" #include "Color.h" #include "debug.h" #include "lyx_main.h"
