os: unexport xstrtokenize()

Not used by any external drivers/modules, so no need to keep it public.
Since modesetting is using it, still needs _X_EXPORT, as long as it's
a module.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

config/hal.c

@@ -32,8 +32,8 @@
 #include <hal/libhal.h>
 
 #include "config/hotplug_priv.h"
-
 #include "config/dbus-core.h"
+#include "os/fmt.h"
 
 #include "input.h"
 #include "inputstr.h"

config/udev.c

@@ -30,6 +30,7 @@
 #include <unistd.h>
 
 #include "config/hotplug_priv.h"
+#include "os/fmt.h"
 
 #include "input.h"
 #include "inputstr.h"

hw/xfree86/drivers/modesetting/drmmode_display.c

@@ -33,6 +33,9 @@
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <unistd.h>
+
+#include "os/fmt.h"
+
 #include "dumb_bo.h"
 #include "inputstr.h"
 #include "xf86str.h"

hw/xfree86/parser/InputClass.c

@@ -28,6 +28,9 @@
 #endif
 
 #include <string.h>
+
+#include "os/fmt.h"
+
 #include "os.h"
 #include "xf86Parser.h"
 #include "xf86tokens.h"

hw/xfree86/parser/OutputClass.c

@@ -27,6 +27,8 @@
 #include <xorg-config.h>
 #endif
 
+#include "os/fmt.h"
+
 #include "os.h"
 #include "xf86Parser.h"
 #include "xf86tokens.h"

include/misc.h

@@ -224,8 +224,6 @@ padding_for_int32(const int bytes)
     return ((-bytes) & 3);
 }
 
-extern _X_EXPORT char **xstrtokenize(const char *str, const char *separators);
-
 /* some macros to help swap requests, replies, and events */
 
 #define LengthRestS(stuff) \

os/fmt.h

@@ -6,6 +6,7 @@
 #define _XSERVER_OS_FMT_H
 
 #include <stdint.h>
+#include <X11/Xfuncproto.h>
 
 void FormatInt64(int64_t num, char *string);
 void FormatUInt64(uint64_t num, char *string);
@@ -34,4 +35,7 @@ version_compare(uint32_t a_major, uint32_t a_minor,
     return 0;
 }
 
+/* still needed as long as modesetting is a module */
+_X_EXPORT char **xstrtokenize(const char *str, const char *separators);
+
 #endif /* _XSERVER_OS_FMT_H */

os/string.c

@@ -8,6 +8,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "os/fmt.h"
+
 #include "os.h"
 
 char *

test/input.c

@@ -38,6 +38,7 @@
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
 #include "mi/mi_priv.h"
+#include "os/fmt.h"
 
 #include "misc.h"
 #include "resource.h"