summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2019-11-20 11:04:15 +0300
committerIgor Pashev <pashev.igor@gmail.com>2019-11-20 11:07:15 +0300
commit43b17ae891e056b8ee2deb66fd1dbadad8e74cdd (patch)
treed5da867c58271ca0c97d29765b22771e25af5b15
parentc597bd6df8c385227b46fd95cb8339fea058bfb3 (diff)
downloadillumos-packaging-43b17ae891e056b8ee2deb66fd1dbadad8e74cdd.tar.gz
Exclude floatingpoint.h from math.h
-rw-r--r--libc/debian/patches/math.h-exclude-floatingpoint.h.patch21
-rw-r--r--libc/debian/patches/series1
2 files changed, 22 insertions, 0 deletions
diff --git a/libc/debian/patches/math.h-exclude-floatingpoint.h.patch b/libc/debian/patches/math.h-exclude-floatingpoint.h.patch
new file mode 100644
index 0000000..607683e
--- /dev/null
+++ b/libc/debian/patches/math.h-exclude-floatingpoint.h.patch
@@ -0,0 +1,21 @@
+Subject: Inclusion of floatingpoint.h may cause troubles
+in other packages, for example, GCC's Modula-2 sources
+define variable EOF and when compiled (into C) conflicts
+with the EOF macro which is defined in stdio.h which is pulled
+in from floatingpoint.h.
+This header and the corresponding functions are Solaris extention
+and can be use explicitly if needed.
+Index: libc/usr/src/head/math.h
+===================================================================
+--- libc.orig/usr/src/head/math.h
++++ libc/usr/src/head/math.h
+@@ -337,9 +337,6 @@ extern float modff __P((float, float *))
+ #endif
+ /* END adopted by C99 */
+
+-#if defined(__EXTENSIONS__) || !defined(__cplusplus)
+-#include <floatingpoint.h>
+-#endif
+ #endif /* defined(__EXTENSIONS__) || !defined(_XOPEN_SOURCE) */
+ #endif /* defined(__EXTENSIONS__) || defined(_XOPEN_SOURCE) || ... */
+
diff --git a/libc/debian/patches/series b/libc/debian/patches/series
index 97e9c73..35b3901 100644
--- a/libc/debian/patches/series
+++ b/libc/debian/patches/series
@@ -146,3 +146,4 @@ math.h-feature.patch
nameser.h-types.patch
libm-macro.patch
illumos-6501-pthread_attr_get_np.patch
+math.h-exclude-floatingpoint.h.patch