Annotation of /trunk/vnc/patches/vnc-server-modular-xorg-2.patch
Parent Directory | Revision Log
Revision 638 -
(hide annotations)
(download)
Tue Jun 3 20:43:44 2008 UTC (16 years, 3 months ago) by niro
File size: 1447 byte(s)
Tue Jun 3 20:43:44 2008 UTC (16 years, 3 months ago) by niro
File size: 1447 byte(s)
-renamed patch
1 | niro | 638 | --- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.modular-xorg 2007-03-02 15:45:38.000000000 +0100 |
2 | +++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2007-03-02 15:45:38.000000000 +0100 | ||
3 | @@ -36,8 +36,6 @@ | ||
4 | extern "C" { | ||
5 | #define class c_class | ||
6 | #define public c_public | ||
7 | -#define xor c_xor | ||
8 | -#define and c_and | ||
9 | #ifdef WIN32 | ||
10 | #include <X11/Xwinsock.h> | ||
11 | #endif | ||
12 | @@ -72,11 +70,8 @@ | ||
13 | #include "inputstr.h" | ||
14 | #include "keysym.h" | ||
15 | extern int defaultColorVisualClass; | ||
16 | - extern char buildtime[]; | ||
17 | #undef class | ||
18 | #undef public | ||
19 | -#undef xor | ||
20 | -#undef and | ||
21 | #ifndef VNC_USE_FB | ||
22 | extern Bool cfb16ScreenInit(ScreenPtr, pointer, int, int, int, int, int); | ||
23 | extern Bool cfb32ScreenInit(ScreenPtr, pointer, int, int, int, int, int); | ||
24 | @@ -221,7 +216,7 @@ | ||
25 | |||
26 | void ddxUseMsg() | ||
27 | { | ||
28 | - ErrorF("\nXvnc %s - built %s\n%s", XVNCVERSION, buildtime, XVNCCOPYRIGHT); | ||
29 | + ErrorF("\nXvnc %s\n%s", XVNCVERSION, XVNCCOPYRIGHT); | ||
30 | ErrorF("Underlying X server release %d, %s\n\n", VENDOR_RELEASE, | ||
31 | VENDOR_STRING); | ||
32 | ErrorF("-screen scrn WxHxD set screen's width, height, depth\n"); | ||
33 | @@ -927,7 +922,7 @@ | ||
34 | |||
35 | void InitOutput(ScreenInfo *screenInfo, int argc, char **argv) | ||
36 | { | ||
37 | - ErrorF("\nXvnc %s - built %s\n%s", XVNCVERSION, buildtime, XVNCCOPYRIGHT); | ||
38 | + ErrorF("\nXvnc %s\n%s", XVNCVERSION, XVNCCOPYRIGHT); | ||
39 | ErrorF("Underlying X server release %d, %s\n\n", VENDOR_RELEASE, | ||
40 | VENDOR_STRING); | ||
41 | wellKnownSocketsCreated = true; |