summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-02-15 20:44:13 +0000
committerAdam Jackson <ajax@nwnk.net>2006-02-15 20:44:13 +0000
commitf105b8da11fcf337512b3c39da3368f98da07a33 (patch)
tree8d2c7b8ee5657f0d630bd50956819d77e2d071a5 /hw
parent010d6effa6fa210251b12459882e88aeee82c2c0 (diff)
Mark everything in dixsym.c as _X_EXPORT.
Diffstat (limited to 'hw')
-rw-r--r--hw/xfree86/common/xf86DGA.c6
-rw-r--r--hw/xfree86/common/xf86xvmc.c5
-rw-r--r--hw/xfree86/dummylib/fatalerror.c2
-rw-r--r--hw/xfree86/dummylib/logvwrite.c2
-rw-r--r--hw/xfree86/dummylib/verrorf.c2
-rw-r--r--hw/xfree86/dummylib/xalloc.c16
-rw-r--r--hw/xfree86/dummylib/xf86errorf.c2
-rw-r--r--hw/xfree86/parser/cpconfig.c4
8 files changed, 20 insertions, 19 deletions
diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index d121936c6..cf9caddea 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.3 2005/04/20 12:25:21 daniels Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86DGA.c,v 1.7 2005/11/08 03:12:43 alanc Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.46 2002/12/03 18:17:40 tsi Exp $ */
/*
* Copyright (c) 1998-2002 by The XFree86 Project, Inc.
@@ -64,9 +64,9 @@ DGACopyModeInfo(
);
#if defined(XFree86LOADER) || !defined(XFreeXDGA)
-int *XDGAEventBase = NULL;
+_X_EXPORT int *XDGAEventBase = NULL;
#else
-int *XDGAEventBase = &DGAEventBase;
+_X_EXPORT int *XDGAEventBase = &DGAEventBase;
#endif
#define DGA_GET_SCREEN_PRIV(pScreen) \
diff --git a/hw/xfree86/common/xf86xvmc.c b/hw/xfree86/common/xf86xvmc.c
index a39e1bd4d..cfc63fa42 100644
--- a/hw/xfree86/common/xf86xvmc.c
+++ b/hw/xfree86/common/xf86xvmc.c
@@ -48,10 +48,11 @@
#include "xf86xvpriv.h"
#include "xf86xvmc.h"
+typedef int (*XvMCScreenInitProcPtr)(ScreenPtr, int, XvMCAdaptorPtr);
#ifdef XFree86LOADER
-int (*XvMCScreenInitProc)(ScreenPtr, int, XvMCAdaptorPtr) = NULL;
+_X_EXPORT XvMCScreenInitProcPtr XvMCScreenInitProc = NULL;
#else
-int (*XvMCScreenInitProc)(ScreenPtr, int, XvMCAdaptorPtr) = XvMCScreenInit;
+_X_EXPORT XvMCScreenInitProcPtr XvMCScreenInitProc = XvMCScreenInit;
#endif
diff --git a/hw/xfree86/dummylib/fatalerror.c b/hw/xfree86/dummylib/fatalerror.c
index 6e7d035df..c66ee3329 100644
--- a/hw/xfree86/dummylib/fatalerror.c
+++ b/hw/xfree86/dummylib/fatalerror.c
@@ -13,7 +13,7 @@
* Utility functions required by libxf86_os.
*/
-void
+_X_EXPORT void
FatalError(const char *f, ...)
{
va_list args;
diff --git a/hw/xfree86/dummylib/logvwrite.c b/hw/xfree86/dummylib/logvwrite.c
index 1a36f4912..516380707 100644
--- a/hw/xfree86/dummylib/logvwrite.c
+++ b/hw/xfree86/dummylib/logvwrite.c
@@ -13,7 +13,7 @@
* Utility functions required by libxf86_os.
*/
-void
+_X_EXPORT void
LogVWrite(int verb, const char *format, va_list ap)
{
if (xf86Verbose >= verb)
diff --git a/hw/xfree86/dummylib/verrorf.c b/hw/xfree86/dummylib/verrorf.c
index 7d6e8f81b..ae692bdc6 100644
--- a/hw/xfree86/dummylib/verrorf.c
+++ b/hw/xfree86/dummylib/verrorf.c
@@ -13,7 +13,7 @@
* Utility functions required by libxf86_os.
*/
-void
+_X_EXPORT void
VErrorF(const char *f, va_list args)
{
vfprintf(stderr, f, args);
diff --git a/hw/xfree86/dummylib/xalloc.c b/hw/xfree86/dummylib/xalloc.c
index 48a346866..a78250f2b 100644
--- a/hw/xfree86/dummylib/xalloc.c
+++ b/hw/xfree86/dummylib/xalloc.c
@@ -13,7 +13,7 @@
* Utility functions required by libxf86_os.
*/
-pointer
+_X_EXPORT pointer
Xalloc(unsigned long n)
{
if (!n)
@@ -21,7 +21,7 @@ Xalloc(unsigned long n)
return malloc(n);
}
-pointer
+_X_EXPORT pointer
Xrealloc(pointer p, unsigned long n)
{
if (!n)
@@ -29,7 +29,7 @@ Xrealloc(pointer p, unsigned long n)
return realloc(p, n);
}
-pointer
+_X_EXPORT pointer
Xcalloc(unsigned long n)
{
pointer r;
@@ -39,7 +39,7 @@ Xcalloc(unsigned long n)
return r;
}
-pointer
+_X_EXPORT pointer
XNFalloc(unsigned long n)
{
pointer r;
@@ -51,7 +51,7 @@ XNFalloc(unsigned long n)
}
-pointer
+_X_EXPORT pointer
XNFrealloc(pointer p, unsigned long n)
{
pointer r;
@@ -63,7 +63,7 @@ XNFrealloc(pointer p, unsigned long n)
}
-pointer
+_X_EXPORT pointer
XNFcalloc(unsigned long n)
{
pointer r;
@@ -75,13 +75,13 @@ XNFcalloc(unsigned long n)
}
-void
+_X_EXPORT void
Xfree(pointer p)
{
free(p);
}
-char *
+_X_EXPORT char *
Xstrdup(const char *s)
{
char *sd;
diff --git a/hw/xfree86/dummylib/xf86errorf.c b/hw/xfree86/dummylib/xf86errorf.c
index 6648eaf7c..4ad677413 100644
--- a/hw/xfree86/dummylib/xf86errorf.c
+++ b/hw/xfree86/dummylib/xf86errorf.c
@@ -23,7 +23,7 @@ xf86ErrorF(const char *format, ...)
va_end(ap);
}
-void
+_X_EXPORT void
ErrorF(const char *format, ...)
{
va_list ap;
diff --git a/hw/xfree86/parser/cpconfig.c b/hw/xfree86/parser/cpconfig.c
index 4eb635b30..d16a242da 100644
--- a/hw/xfree86/parser/cpconfig.c
+++ b/hw/xfree86/parser/cpconfig.c
@@ -106,13 +106,13 @@ main (int argc, char *argv[])
/* Functions that the parser requires */
-void
+_X_EXPORT void
VErrorF(const char *f, va_list args)
{
vfprintf(stderr, f, args);
}
-void
+_X_EXPORT void
ErrorF(const char *f, ...)
{
va_list args;