From 85261cde8077b8e36351ee1da3a76474b46c543a Mon Sep 17 00:00:00 2001
From: Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
Date: Sun, 13 Jan 2008 04:41:14 +0100
Subject: [PATCH] Split the wrapper in module and export syms.

---
 obj/wrap/Makefile                        |  2 +-
 obj/wrap/exportsyms.c                    | 31 +++++++++++++++++++++++
 obj/wrap/{nvidia_wrap.c => wrapmodule.c} | 32 ------------------------
 3 files changed, 32 insertions(+), 33 deletions(-)
 create mode 100644 obj/wrap/exportsyms.c
 rename obj/wrap/{nvidia_wrap.c => wrapmodule.c} (62%)

diff --git a/obj/wrap/Makefile b/obj/wrap/Makefile
index ed5f7b3..0d50433 100644
--- a/obj/wrap/Makefile
+++ b/obj/wrap/Makefile
@@ -1,5 +1,5 @@
 SHLIB_NAME= libnvidia_wrap.so
-SRCS=	nvidia_wrap.c
+SRCS=	wrapmodule.c exportsyms.c
 NOMAN=
 
 XORGDIR?=	/usr/pkg
diff --git a/obj/wrap/exportsyms.c b/obj/wrap/exportsyms.c
new file mode 100644
index 0000000..c32a93a
--- /dev/null
+++ b/obj/wrap/exportsyms.c
@@ -0,0 +1,31 @@
+/* Wrapper symbols */
+
+#include <ctype.h>
+
+extern __thread int	errno;
+
+int *
+__error(void)
+{
+	return (&errno);
+}
+
+int
+___tolower(int c)
+{
+	return (tolower(c));
+}
+
+int
+___toupper(int c)
+{
+	return (toupper(c));
+}
+
+unsigned long ___runetype_mb(int);
+
+unsigned long
+___runetype(int c)
+{
+	return (___runetype_mb(c));
+}
diff --git a/obj/wrap/nvidia_wrap.c b/obj/wrap/wrapmodule.c
similarity index 62%
rename from obj/wrap/nvidia_wrap.c
rename to obj/wrap/wrapmodule.c
index 344998e..a09dbd3 100644
--- a/obj/wrap/nvidia_wrap.c
+++ b/obj/wrap/wrapmodule.c
@@ -27,35 +27,3 @@ nvidia_wrapSetup(pointer module, pointer opts, int *errmaj, int *errmin)
 {
 	xf86DrvMsg(0, X_INFO, "Nvidia binary wrapper loaded.\n");
 }
-
-/* Wrapper symbols */
-
-#include <ctype.h>
-
-extern __thread int	errno;
-
-_X_EXPORT int *
-__error(void)
-{
-	return (&errno);
-}
-
-_X_EXPORT int
-___tolower(int c)
-{
-	return (tolower(c));
-}
-
-_X_EXPORT int
-___toupper(int c)
-{
-	return (toupper(c));
-}
-
-unsigned long ___runetype_mb(int);
-
-_X_EXPORT unsigned long
-___runetype(int c)
-{
-	return (___runetype_mb(c));
-}
-- 
2.41.0