diff options
author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-12-03 05:43:34 -0200 |
---|---|---|
committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-12-03 05:43:34 -0200 |
commit | 49f77fff1495c0a2050fb18f9b1fc627839bbfc2 (patch) | |
tree | eebaec908150abfc0159d9ee941404918f553113 /fb/fbbltone.c | |
parent | 0b8f8b24f718820a72ebdc52423c2e6a44e848c5 (diff) |
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
Diffstat (limited to 'fb/fbbltone.c')
-rw-r--r-- | fb/fbbltone.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/fb/fbbltone.c b/fb/fbbltone.c index ec9300f6c..ffe69775a 100644 --- a/fb/fbbltone.c +++ b/fb/fbbltone.c @@ -78,7 +78,7 @@ #endif #if FB_SHIFT == 6 -_X_EXPORT CARD8 fb8Lane[256] = { +CARD8 fb8Lane[256] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, @@ -95,33 +95,33 @@ _X_EXPORT CARD8 fb8Lane[256] = { 242, 243, 244,245,246,247,248,249,250,251,252,253,254,255, }; -_X_EXPORT CARD8 fb16Lane[256] = { +CARD8 fb16Lane[256] = { 0x00, 0x03, 0x0c, 0x0f, 0x30, 0x33, 0x3c, 0x3f, 0xc0, 0xc3, 0xcc, 0xcf, 0xf0, 0xf3, 0xfc, 0xff, }; -_X_EXPORT CARD8 fb32Lane[16] = { +CARD8 fb32Lane[16] = { 0x00, 0x0f, 0xf0, 0xff, }; #endif #if FB_SHIFT == 5 -_X_EXPORT CARD8 fb8Lane[16] = { +CARD8 fb8Lane[16] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }; -_X_EXPORT CARD8 fb16Lane[16] = { +CARD8 fb16Lane[16] = { 0, 3, 12, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; -_X_EXPORT CARD8 fb32Lane[16] = { +CARD8 fb32Lane[16] = { 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; #endif -_X_EXPORT CARD8 *fbLaneTable[33] = { +CARD8 *fbLaneTable[33] = { 0, 0, 0, 0, 0, 0, 0, 0, fb8Lane, 0, 0, 0, 0, 0, 0, 0, fb16Lane, 0, 0, 0, 0, 0, 0, 0, @@ -130,7 +130,7 @@ _X_EXPORT CARD8 *fbLaneTable[33] = { }; #endif -_X_EXPORT void +void fbBltOne (FbStip *src, FbStride srcStride, /* FbStip units per scanline */ int srcX, /* bit position of source */ @@ -457,7 +457,7 @@ fbBltOne (FbStip *src, #define FbStip24New(rot) (2 + (rot != 0)) #define FbStip24Len 4 -_X_EXPORT const FbBits fbStipple24Bits[3][1 << FbStip24Len] = { +const FbBits fbStipple24Bits[3][1 << FbStip24Len] = { /* rotate 0 */ { C4_24( 0, 0), C4_24( 1, 0), C4_24( 2, 0), C4_24( 3, 0), @@ -569,7 +569,7 @@ const FbBits fbStipple24Bits[3][1 << FbStip24Len] = { * have no acceleration so this code is used for stipples, copyplane * and text */ -_X_EXPORT void +void fbBltOne24 (FbStip *srcLine, FbStride srcStride, /* FbStip units per scanline */ int srcX, /* bit position of source */ @@ -754,7 +754,7 @@ fbBltOne24 (FbStip *srcLine, * from an N bit image to a 1 bit image */ -_X_EXPORT void +void fbBltPlane (FbBits *src, FbStride srcStride, int srcX, |