summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2008-01-02 19:19:55 -0800
committerAlan Coopersmith <alan.coopersmith@sun.com>2008-01-02 19:19:55 -0800
commitf6666dcc3b1ac60f850ea53c357a9ef61672a52a (patch)
tree564176597bd76d464441cc6948a22ad1f0aec0ba
parent73f422996016107d5f53492e4197bb05ed9c4bb9 (diff)
Add dixAllocatePrivate stub to dummylib for utils
Normally not necessary, except when building non-optimized/debug causes the inline functions from private.h to appear in os-support/libxorgos.la
-rw-r--r--hw/xfree86/dummylib/Makefile.am1
-rw-r--r--hw/xfree86/dummylib/dixprivates.c19
2 files changed, 20 insertions, 0 deletions
diff --git a/hw/xfree86/dummylib/Makefile.am b/hw/xfree86/dummylib/Makefile.am
index 3e70d25fe..2ab0a77ae 100644
--- a/hw/xfree86/dummylib/Makefile.am
+++ b/hw/xfree86/dummylib/Makefile.am
@@ -13,6 +13,7 @@ STRL_SRCS = $(top_srcdir)/os/strlcat.c $(top_srcdir)/os/strlcpy.c
endif
libdummy_nonserver_a_SOURCES = \
+ dixprivates.c \
fatalerror.c \
logvwrite.c \
$(STRL_SRCS) \
diff --git a/hw/xfree86/dummylib/dixprivates.c b/hw/xfree86/dummylib/dixprivates.c
new file mode 100644
index 000000000..40c173a20
--- /dev/null
+++ b/hw/xfree86/dummylib/dixprivates.c
@@ -0,0 +1,19 @@
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <X11/X.h>
+#include "os.h"
+#include "xf86.h"
+#include "xf86Priv.h"
+
+/*
+ * Utility functions required by libxf86_os.
+ */
+
+_X_EXPORT pointer *
+dixAllocatePrivate(PrivateRec **privates, const DevPrivateKey key)
+{
+ return NULL; /* not used */
+}
+