diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2014-09-21 01:28:29 -0700 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2014-09-21 01:28:29 -0700 |
| commit | e42e42e6dcbd4d7c159aaa980a74dd5647bcb45a (patch) | |
| tree | 363b469aca6e2dae277d70c43533587b0f86f86c /xorg/server/module | |
| parent | 103a03aecaebbe45585740563b75dec44224c0e4 (diff) | |
| download | xrdp-proprietary-e42e42e6dcbd4d7c159aaa980a74dd5647bcb45a.tar.gz xrdp-proprietary-e42e42e6dcbd4d7c159aaa980a74dd5647bcb45a.zip | |
Xorg: some define changes, remove dups
Diffstat (limited to 'xorg/server/module')
| -rw-r--r-- | xorg/server/module/rdp.h | 10 | ||||
| -rw-r--r-- | xorg/server/module/rdpMain.c | 10 | ||||
| -rw-r--r-- | xorg/server/module/rdpXv.c | 2 |
3 files changed, 12 insertions, 10 deletions
diff --git a/xorg/server/module/rdp.h b/xorg/server/module/rdp.h index 80df5f01..61dfbb1c 100644 --- a/xorg/server/module/rdp.h +++ b/xorg/server/module/rdp.h @@ -30,6 +30,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "rdpPri.h" +#define XRDP_MODULE_NAME "XRDPMOD" +#define XRDP_DRIVER_NAME "XRDPDEV" +#define XRDP_MOUSE_NAME "XRDPMOUSE" +#define XRDP_KEYB_NAME "XRDPKEYB" +#define XRDP_VERSION 1000 + +#define PACKAGE_VERSION_MAJOR 1 +#define PACKAGE_VERSION_MINOR 0 +#define PACKAGE_VERSION_PATCHLEVEL 0 + #define COLOR8(r, g, b) \ ((((r) >> 5) << 0) | (((g) >> 5) << 3) | (((b) >> 6) << 6)) #define COLOR15(r, g, b) \ diff --git a/xorg/server/module/rdpMain.c b/xorg/server/module/rdpMain.c index a8786ac2..2f6db7c7 100644 --- a/xorg/server/module/rdpMain.c +++ b/xorg/server/module/rdpMain.c @@ -47,14 +47,6 @@ rdp module main #define LLOGLN(_level, _args) \ do { if (_level < LOG_LEVEL) { ErrorF _args ; ErrorF("\n"); } } while (0) -#define XRDP_DRIVER_NAME "XORGXRDP" -#define XRDP_NAME "XORGXRDP" -#define XRDP_VERSION 1000 - -#define PACKAGE_VERSION_MAJOR 1 -#define PACKAGE_VERSION_MINOR 0 -#define PACKAGE_VERSION_PATCHLEVEL 0 - static Bool g_initialised = FALSE; /*****************************************************************************/ @@ -95,7 +87,7 @@ xorgxrdpDownDown(ScreenPtr pScreen) static MODULESETUPPROTO(xorgxrdpSetup); static XF86ModuleVersionInfo RDPVersRec = { - XRDP_DRIVER_NAME, + XRDP_MODULE_NAME, MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, diff --git a/xorg/server/module/rdpXv.c b/xorg/server/module/rdpXv.c index 44a4d76c..1c347b2f 100644 --- a/xorg/server/module/rdpXv.c +++ b/xorg/server/module/rdpXv.c @@ -545,7 +545,7 @@ rdpXvInit(ScreenPtr pScreen, ScrnInfoPtr pScrn) } adaptor->type = XvInputMask | XvImageMask | XvVideoMask | XvStillMask | XvWindowMask | XvPixmapMask; adaptor->flags = VIDEO_CLIP_TO_VIEWPORT; - adaptor->name = "XORGXRDP XVideo Adaptor"; + adaptor->name = XRDP_MODULE_NAME " XVideo Adaptor"; adaptor->nEncodings = T_NUM_ENCODINGS; adaptor->pEncodings = &(g_xrdpVidEncodings[0]); adaptor->nFormats = T_NUM_FORMATS; |