bug 992: SP/PC define pollution in solaris breaks build

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10587 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index 0010a2e0d773011bef027155c7b401f1984bb57a..29d72a188f7cbaf890d0ce1b7995fe4a3a3c5ec1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-02  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * lyxlength.h: undefine macros that clash with solaris/x86 (bug 992)
+
 2005-11-03  Michael Gerz  <michael.gerz@teststep.org>
 
        * messages.C: fix crash and localization on MinGW/Windows platform

diff --git a/src/lyxlength.h b/src/lyxlength.h
index 78416cbefd35de1b9b281b30f5044440a0dd7b6b..c0c658d6931c3032272171ec4f712711052db882 100644 (file)
--- a/src/lyxlength.h
+++ b/src/lyxlength.h
@@ -17,6 +17,15 @@
 
 #include <string>
 
+// Solaris/x86 version 9 and earlier define these
+#ifdef PC
+#  undef PC
+#endif
+#ifdef SP
+#  undef SP
+#endif
+
+
 /**
  * LyXLength - Represents latex length measurement
  */