From 17ac5b3f52a86a798d15fa97d655f49370efb18a Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Thu, 3 Nov 2005 10:49:32 +0000
Subject: [PATCH] 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
---
 src/ChangeLog   | 4 ++++
 src/lyxlength.h | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/ChangeLog b/src/ChangeLog
index 0010a2e0d7..29d72a188f 100644
--- 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 78416cbefd..c0c658d693 100644
--- 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
  */
-- 
2.39.5