diff options
author | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
commit | 81f91c615982e50bb62708201569c33a3cd3d973 (patch) | |
tree | 4f32ecc48a3b7b5e76642f3792338263c53879bd /xorg-server/include/servermd.h | |
parent | b571a562410f565af2bdde52d9f7f9a23ffae04f (diff) | |
parent | a915739887477b28d924ecc8417ee107d125bd6c (diff) | |
download | vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.gz vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.bz2 vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.zip |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/include/servermd.h')
-rw-r--r-- | xorg-server/include/servermd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/include/servermd.h b/xorg-server/include/servermd.h index 8cc20f000..c851d19bc 100644 --- a/xorg-server/include/servermd.h +++ b/xorg-server/include/servermd.h @@ -294,6 +294,7 @@ SOFTWARE. #define LOG2_BYTES_PER_SCANLINE_PAD 2 #endif +#include <X11/Xfuncproto.h> /* * This returns the number of padding units, for depth d and width w. * For bitmaps this can be calculated with the macros above. @@ -309,7 +310,7 @@ typedef struct _PaddingInfo { int bytesPerPixel; /* only set when notPower2 is TRUE */ int bitsPerPixel; /* bits per pixel */ } PaddingInfo; -extern PaddingInfo PixmapWidthPaddingInfo[]; +extern _X_EXPORT PaddingInfo PixmapWidthPaddingInfo[]; /* The only portable way to get the bpp from the depth is to look it up */ #define BitsPerPixel(d) (PixmapWidthPaddingInfo[d].bitsPerPixel) |