From c8e3b4a7f27dadee095e044ef84170e8855e70f9 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Wed, 28 Dec 2005 15:54:58 +0000
Subject: INTEGRATION: CWS sb37 (1.8.50); FILE MERGED 2005/09/12 17:01:06 hjs
 1.8.50.2: RESYNC: (1.8-1.9); FILE MERGED 2005/09/12 16:22:58 hjs 1.8.50.1:
 #125477# soften C restrictions because of gnome inludes

---
 sysui/desktop/util/makefile.mk | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'sysui/desktop/util')

diff --git a/sysui/desktop/util/makefile.mk b/sysui/desktop/util/makefile.mk
index 28bd2eedf877..2269144b0aed 100644
--- a/sysui/desktop/util/makefile.mk
+++ b/sysui/desktop/util/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.9 $
+#   $Revision: 1.10 $
 #
-#   last change: $Author: rt $ $Date: 2005-09-09 11:51:24 $
+#   last change: $Author: hr $ $Date: 2005-12-28 16:54:58 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -53,6 +53,13 @@ PKGCONFIG_MODULES=gnome-vfs-2.0 ORBit-2.0 ORBit-CosNaming-2.0 gconf-2.0 bonobo-a
 .INCLUDE: pkg_config.mk
 
 .IF "$(OS)" == "SOLARIS"
+.IF "$(SYSBASE)"!=""
+.IF "$(COMNAME)"=="sunpro5"
+# soften C restrictions to survive "inline" keyword
+CFLAGSCC!:=$(subst,-xc99=none,-xc99=no_lib $(CFLAGSCC))
+.ENDIF          # "$(COMNAME)"=="sunpro5"
+.ENDIF			# "$(SYSBASE)"!=""
+
 LINKFLAGS+=-z nodefs
 .ENDIF # "$(OS)" == "SOLARIS"
 
-- 
cgit v1.2.3