diff options
| author | marha <marha@users.sourceforge.net> | 2010-10-05 10:44:08 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-10-05 10:44:08 +0000 |
| commit | bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a (patch) | |
| tree | 37c4a2982fb317254b1ea14dd06c355f9da7826a /xorg-server | |
| parent | fe234aa555e2b16ac7836fee297878a6e3efe343 (diff) | |
| parent | 51f3d1e140307561f64c47dae1d44f912accb5cf (diff) | |
| download | vcxsrv-bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a.tar.gz vcxsrv-bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a.tar.bz2 vcxsrv-bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/Xext/securitysrv.h | 5 | ||||
| -rw-r--r-- | xorg-server/hw/kdrive/src/kdrive.h | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xfree86/loader/loader.c | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/xorg-server/Xext/securitysrv.h b/xorg-server/Xext/securitysrv.h index 3d3894a18..68f51d2f5 100644 --- a/xorg-server/Xext/securitysrv.h +++ b/xorg-server/Xext/securitysrv.h @@ -31,10 +31,7 @@ from The Open Group. #define _SECURITY_SRV_H /* Allow client side portions of <X11/extensions/security.h> to compile */ -#ifndef Status -# define Status int -# define NEED_UNDEF_Status -#endif +typedef int Status; #ifndef Display # define Display void # define NEED_UNDEF_Display diff --git a/xorg-server/hw/kdrive/src/kdrive.h b/xorg-server/hw/kdrive/src/kdrive.h index 8873662ee..9cf44f01e 100644 --- a/xorg-server/hw/kdrive/src/kdrive.h +++ b/xorg-server/hw/kdrive/src/kdrive.h @@ -53,7 +53,7 @@ #define KD_DPMS_POWERDOWN 3
#define KD_DPMS_MAX KD_DPMS_POWERDOWN
-#define Status int
+typedef int Status;
typedef struct _KdCardInfo {
struct _KdCardFuncs *cfuncs;
diff --git a/xorg-server/hw/xfree86/loader/loader.c b/xorg-server/hw/xfree86/loader/loader.c index 32c4431de..dce3b22f6 100644 --- a/xorg-server/hw/xfree86/loader/loader.c +++ b/xorg-server/hw/xfree86/loader/loader.c @@ -184,7 +184,8 @@ void LoaderUnload(const char *name, void *handle)
{
xf86Msg(X_INFO, "Unloading %s\n", name);
- dlclose(handle);
+ if (handle)
+ dlclose(handle);
}
unsigned long LoaderOptions = 0;
|