[commits] r12163 - in /libdfp/trunk: ChangeLog dfp/math.h

[ryanarn@xxxxxxxxxx]

Author: ryanarn
Date: Mon Nov 29 08:24:37 2010
New Revision: 12163

Log:
Fix position of #include_next <math.h> so that math.h is always picked up
regardless of whether __STDC_WANT_DEC_FP__ is defined or not.

2010-11-29  Ryan S. Arnold  <rsa@xxxxxxxxxx>

	* dfp/math.h: Move #include_next <math.h> so that if the compiler
	invocation has -I/<path>/include/dfp/ but doesn't define
	__STDC_WANT_DEC_FP__ that they still get the system math.h.


Modified:
    libdfp/trunk/ChangeLog
    libdfp/trunk/dfp/math.h

Modified: libdfp/trunk/ChangeLog
==============================================================================
--- libdfp/trunk/ChangeLog (original)
+++ libdfp/trunk/ChangeLog Mon Nov 29 08:24:37 2010
@@ -1,3 +1,9 @@
+2010-11-29  Ryan S. Arnold  <rsa@xxxxxxxxxx>
+
+	* dfp/math.h: Move #include_next <math.h> so that if the compiler
+	invocation has -I/<path>/include/dfp/ but doesn't define
+	__STDC_WANT_DEC_FP__ that they still get the system math.h.
+
 2010-11-19  Ryan S. Arnold  <rsa@xxxxxxxxxx>
 
 	* CONTRIBUTORS: Added Luis Machado.  Added DCO requirements.

Modified: libdfp/trunk/dfp/math.h
==============================================================================
--- libdfp/trunk/dfp/math.h (original)
+++ libdfp/trunk/dfp/math.h Mon Nov 29 08:24:37 2010
@@ -2,7 +2,7 @@
    system math.h classification macros.
 
    Copyright (C) 2006 IBM Corporation.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This file is part of the Decimal Floating Point C Library.
 
@@ -31,11 +31,14 @@
 # error "dfp/<math.h> should be included before the system math.h."
 #endif
 
-#ifdef __STDC_WANT_DEC_FP__
-
 /* Include the system math.h first so that we can undef and redefine the
  * classification functions to select for _Decimal[32|64|128] types.  */
 #include_next <math.h>
+
+/* Include this after the #include_next <math.h> so that if the user has
+ * -I/<path>/include/dfp/ on their compilation line but doesn't define
+ *  __STDC_WANT_DEC_FPP that they still get the system math.h.  */
+#ifdef __STDC_WANT_DEC_FP__
 
 #include <features.h>
 __BEGIN_DECLS