summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2004-02-16 20:19:59 +0000
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2004-02-16 20:19:59 +0000
commitd17586c4dc858d0127fa021e6db62f8cc28ef7a6 (patch)
treede39441b741e32d2d9738bb5d925514fc59d1543
parente90274c2bba1f66a68c2bc30ddb589dbf6fa0929 (diff)
[fd.o bugzilla #189] _XOPEN_SOURCE defines break builds on Solaris Express
-rw-r--r--hw/xfree86/common/xf86cmap.c4
-rw-r--r--mi/miarc.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c
index f7cb065a4..52ab57f4a 100644
--- a/hw/xfree86/common/xf86cmap.c
+++ b/hw/xfree86/common/xf86cmap.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86cmap.c,v 1.25 2003/10/17 20:02:12 alanh Exp $ */
/*
* Copyright (c) 1998-2001 by The XFree86 Project, Inc.
@@ -26,7 +27,8 @@
* authorization from the copyright holder(s) and author(s).
*/
-#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__)
+#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \
+ || (defined(sun) && defined(__SVR4))
#include <math.h>
#else
#define _XOPEN_SOURCE /* to get prototype for pow on some systems */
diff --git a/mi/miarc.c b/mi/miarc.c
index 70b9fde04..38bd998ee 100644
--- a/mi/miarc.c
+++ b/mi/miarc.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/mi/miarc.c,v 3.15 2003/12/06 18:46:28 dawes Exp $ */
+/* $XdotOrg: xc/programs/Xserver/mi/miarc.c,v 1.1.4.3 2003/12/20 00:28:31 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.15 2003/12/06 18:46:28 dawes Exp $ */
/***********************************************************
@@ -50,7 +50,8 @@ SOFTWARE.
/* Author: Keith Packard and Bob Scheifler */
/* Warning: this code is toxic, do not dally very long here. */
-#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__)
+#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \
+ || (defined(sun) && defined(__SVR4))
#include <math.h>
#else
#define _XOPEN_SOURCE /* to get prototype for hypot on some systems */