From 7065fdf6c5de7886e5789c42d0b089eacaac600a Mon Sep 17 00:00:00 2001
From: Elliot Saba <staticfloat@gmail.com>
Date: Sat, 8 Feb 2014 21:35:14 -0800
Subject: [PATCH 1/2] Remove {cdefs,types}-compat.h from openlibm.h

---
 src/openlibm.h | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/openlibm.h b/src/openlibm.h
index 5e6ba5d..5a37093 100644
--- a/src/openlibm.h
+++ b/src/openlibm.h
@@ -17,8 +17,11 @@
 #ifndef _MATH_H_
 #define	_MATH_H_
 
-#include "cdefs-compat.h"
-#include "types-compat.h"
+#if (defined(_WIN32) || defined (_MSC_VER)) && !defined(__WIN32__)
+    #define __WIN32__
+#endif
+
+#define __pure2
 
 /*
  * ANSI/POSIX
@@ -172,7 +175,10 @@ extern int signgam;
  * effect of raising floating-point exceptions, so they are not declared
  * as __pure2.  In C99, FENV_ACCESS affects the purity of these functions.
  */
-__BEGIN_DECLS
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
 /*
  * ANSI/POSIX
  */
@@ -490,5 +496,7 @@ long double	tgammal(long double);
 long double	truncl(long double);
 
 #endif /* __ISO_C_VISIBLE >= 1999 */
-__END_DECLS
+#if defined(__cplusplus)
+}
+#endif
 #endif /* !_MATH_H_ */

From ea52e04b6d69cef86714e6e406a3202395551b1d Mon Sep 17 00:00:00 2001
From: Elliot Saba <staticfloat@gmail.com>
Date: Sat, 8 Feb 2014 21:36:49 -0800
Subject: [PATCH 2/2] Revert "Install everything in the `include/` directory
 into `$(prefix)/include/openlibm`."

This reverts commit eb2f4d4b44e6ffaede3057d2cb6c6bae77de863f.
---
 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 791984d..a3950c3 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,6 @@ distclean:
 
 install: all
 	mkdir -p $(DESTDIR)$(libdir)
-	mkdir -p $(DESTDIR)$(includedir)/openlibm
+	mkdir -p $(DESTDIR)$(includedir)
 	cp -a libopenlibm.$(SHLIB_EXT)* libopenlibm.a $(DESTDIR)$(libdir)/
 	cp -a src/openlibm.h $(DESTDIR)$(includedir)/
-	cp -a include/*.h $(DESTDIR)$(includedir)/openlibm/