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
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
|
diff -rc vnc_unixsrc.org/Xvnc/config/cf/linux.cf vnc_unixsrc/Xvnc/config/cf/linux.cf
*** vnc_unixsrc.org/Xvnc/config/cf/linux.cf Tue Jan 31 11:22:43 2006
--- vnc_unixsrc/Xvnc/config/cf/linux.cf Tue Jan 31 22:37:34 2006
***************
*** 295,301 ****
#define OptimizedCDebugFlags -O2
#define LinuxMachineDefines -D__x86_64__
#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
! #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
#endif /* x86_64PCArchitecture */
#ifdef ArmArchitecture
--- 295,301 ----
#define OptimizedCDebugFlags -O2
#define LinuxMachineDefines -D__x86_64__
#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
! #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
#endif /* x86_64PCArchitecture */
#ifdef ArmArchitecture
diff -rc vnc_unixsrc.org/Xvnc/include/Xmd.h vnc_unixsrc/Xvnc/include/Xmd.h
*** vnc_unixsrc.org/Xvnc/include/Xmd.h Sun Jun 11 07:00:52 2000
--- vnc_unixsrc/Xvnc/include/Xmd.h Tue Jan 31 15:15:02 2006
***************
*** 59,65 ****
#ifdef CRAY
#define WORD64 /* 64-bit architecture */
#endif
! #if defined(__alpha) || defined(__alpha__)
#define LONG64 /* 32/64-bit architecture */
#endif
#ifdef __sgi
--- 59,65 ----
#ifdef CRAY
#define WORD64 /* 64-bit architecture */
#endif
! #if defined(__alpha) || defined(__alpha__) || defined(__x86_64__)
#define LONG64 /* 32/64-bit architecture */
#endif
#ifdef __sgi
diff -rc vnc_unixsrc.org/Xvnc/lib/font/bitmap/bdfread.c vnc_unixsrc/Xvnc/lib/font/bitmap/bdfread.c
*** vnc_unixsrc.org/Xvnc/lib/font/bitmap/bdfread.c Sun Jun 11 07:00:52 2000
--- vnc_unixsrc/Xvnc/lib/font/bitmap/bdfread.c Tue Jan 31 15:15:02 2006
***************
*** 79,85 ****
byte,
glyph,
scan;
! int sizes[GLYPHPADOPTIONS];
{
int widthBits,
widthBytes,
--- 79,85 ----
byte,
glyph,
scan;
! CARD32 sizes[GLYPHPADOPTIONS];
{
int widthBits,
widthBytes,
diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/dix/dixutils.c vnc_unixsrc/Xvnc/programs/Xserver/dix/dixutils.c
*** vnc_unixsrc.org/Xvnc/programs/Xserver/dix/dixutils.c Sun Jun 11 07:00:51 2000
--- vnc_unixsrc/Xvnc/programs/Xserver/dix/dixutils.c Tue Jan 31 15:15:02 2006
***************
*** 404,409 ****
--- 404,410 ----
*/
void
NoopDDA(
+ #undef NeedVarargsPrototypes
#if NeedVarargsPrototypes
void* f, ...
#endif
diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/httpd.c vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/httpd.c
*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/httpd.c Tue Apr 8 17:18:33 2003
--- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/httpd.c Tue Jan 31 15:15:02 2006
***************
*** 39,44 ****
--- 39,45 ----
#endif
#if USE_LIBWRAP
#include <tcpd.h>
+ #include <arpa/inet.h>
#endif
#include "rfb.h"
diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/init.c vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/init.c
*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/init.c Fri Feb 27 06:22:47 2004
--- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/init.c Tue Jan 31 15:15:02 2006
***************
*** 80,85 ****
--- 80,86 ----
#include <sys/param.h>
#include "dix.h"
#include "rfb.h"
+ #include <time.h>
#ifdef CORBA
#include <vncserverctrl.h>
diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/rfb.h vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/rfb.h
*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/rfb.h Fri Feb 27 06:22:47 2004
--- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/rfb.h Tue Jan 31 15:15:02 2006
***************
*** 30,35 ****
--- 30,36 ----
#include <rfbproto.h>
#include <vncauth.h>
#include <zlib.h>
+ #include <stdarg.h>
/* It's a good idea to keep these values a bit greater than required. */
#define MAX_ENCODINGS 10
diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/sockets.c vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/sockets.c
*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/sockets.c Sun Oct 27 06:36:02 2002
--- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/sockets.c Tue Jan 31 15:15:02 2006
***************
*** 42,47 ****
--- 42,48 ----
#include <sys/time.h>
#include <sys/socket.h>
#include <netinet/in.h>
+ #include <arpa/inet.h>
#include <netinet/tcp.h>
#include <netdb.h>
#include <fcntl.h>
diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/include/dix.h vnc_unixsrc/Xvnc/programs/Xserver/include/dix.h
*** vnc_unixsrc.org/Xvnc/programs/Xserver/include/dix.h Sun Jun 11 07:00:52 2000
--- vnc_unixsrc/Xvnc/programs/Xserver/include/dix.h Tue Jan 31 15:15:02 2006
***************
*** 479,484 ****
--- 479,485 ----
);
extern void NoopDDA(
+ #undef NeedVarargsPrototypes
#if NeedVarargsPrototypes
void *,
...
diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/include/servermd.h vnc_unixsrc/Xvnc/programs/Xserver/include/servermd.h
*** vnc_unixsrc.org/Xvnc/programs/Xserver/include/servermd.h Wed Feb 19 10:39:54 2003
--- vnc_unixsrc/Xvnc/programs/Xserver/include/servermd.h Tue Jan 31 17:05:16 2006
***************
*** 374,379 ****
--- 374,398 ----
#define NO_ONE_RECT
#endif
+ /* Values for AMD Opteron and Intel 64 bit extensions. Copied from Alpha.
+ */
+ #ifdef __x86_64__
+ # define BITMAP_SCANLINE_UNIT 64
+ # define BITMAP_SCANLINE_PAD 64
+ # define LOG2_BITMAP_PAD 6
+ # define LOG2_BYTES_PER_SCANLINE_PAD 3
+
+ /* Add for handling protocol XPutImage and XGetImage; see comment in
+ * Alpha section.
+ */
+ #define INTERNAL_VS_EXTERNAL_PADDING
+ #define BITMAP_SCANLINE_UNIT_PROTO 32
+
+ #define BITMAP_SCANLINE_PAD_PROTO 32
+ #define LOG2_BITMAP_PAD_PROTO 5
+ #define LOG2_BYTES_PER_SCANLINE_PAD_PROTO 2
+ #endif
+
#endif /* SVR4 / BSD / i386 */
#if defined (linux) && defined (__mc68000__)
|
GitWeb