Author: pascalek Date: Sun Jan 4 17:06:00 2009 GMT Module: SOURCES Tag: HEAD ---- Log message: - initial revision
---- Files affected: SOURCES: vnc-Makefile.am (NONE -> 1.1) (NEW), vnc-autotools-compile.patch (NONE -> 1.1) (NEW), vnc-autotools.patch (NONE -> 1.1) (NEW), vnc-always_use_fb.patch (NONE -> 1.1) (NEW), vnc-vsnprintf.patch (NONE -> 1.1) (NEW), vnc-24bit.patch (NONE -> 1.1) (NEW), vnc-gcc43.patch (NONE -> 1.1) (NEW), vnc-xorg.patch (NONE -> 1.1) (NEW), vnc-privates.patch (NONE -> 1.1) (NEW), vnc-mieq.patch (NONE -> 1.1) (NEW), vnc-allocate.patch (NONE -> 1.1) (NEW), vnc-paint.patch (NONE -> 1.1) (NEW), vnc-selections.patch (NONE -> 1.1) (NEW), vnc-manminor.patch (NONE -> 1.1) (NEW), vnc-clipboard.patch (NONE -> 1.1) (NEW), vnc-scrollbars.patch (NONE -> 1.1) (NEW), vnc-bounds.patch (NONE -> 1.1) (NEW), vnc-includes.patch (NONE -> 1.1) (NEW), vnc-viewerIPv6.patch (NONE -> 1.1) (NEW), vnc-rh212985.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/vnc-Makefile.am diff -u /dev/null SOURCES/vnc-Makefile.am:1.1 --- /dev/null Sun Jan 4 18:06:00 2009 +++ SOURCES/vnc-Makefile.am Sun Jan 4 18:05:44 2009 @@ -0,0 +1,60 @@ +LIB_DIR=$(top_srcdir)/../../common +BIN_DIR=$(top_srcdir)/.. + +RFB_LIBS=$(LIB_DIR)/rfb/librfb.la + +noinst_LTLIBRARIES = libvnccommon.la + +libvnccommon_la_SOURCES = vncExtInit.cc vncHooks.cc XserverDesktop.cc + +libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ + -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(LIB_DIR) \ + -I$(BIN_DIR)/vncconfig -DGC_HAS_COMPOSITE_CLIP $(XVNC_CPPFLAGS) \ + -I$(includedir)/pixman-1 + +bin_PROGRAMS = Xvnc + +Xvnc_SOURCES = xvnc.cc $(top_srcdir)/Xext/dpmsstubs.c \ + $(top_srcdir)/Xi/stubs.c $(top_srcdir)/mi/miinitext.c \ + $(top_srcdir)/fb/fbcmap_mi.c + +nodist_Xvnc_SOURCES = fbrop.h fb.h pixman.h + +Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS \ + -DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ + -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(LIB_DIR) \ + -I$(top_srcdir)/include -I$(includedir)/pixman-1 + +Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(RFB_LIBS) \ + $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lX11 + +Xvnc_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) + +libvnc_la_LTLIBRARIES = libvnc.la +libvnc_ladir = $(moduledir)/extensions + +libvnc_la_SOURCES = xf86vncModule.cc + +libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I$(LIB_DIR) \ + -I$(top_srcdir)/hw/xfree86/common \ + -I$(top_srcdir)/hw/xfree86/os-support \ + -I$(top_srcdir)/hw/xfree86/os-support/bus \ + -DXFree86Module -DXFree86LOADER -DIN_MODULE \ + -I$(includedir)/pixman-1 + +libvnc_la_LDFLAGS = -module -avoid-version + +libvnc_la_LIBADD = libvnccommon.la $(RFB_LIBS) + +# C++ hacks +BUILT_SOURCES = $(nodist_Xvnc_SOURCES) + +fb.h: $(top_srcdir)/fb/fb.h + cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fb.h + +pixman.h: $(includedir)/pixman-1/pixman.h + cat $(includedir)/pixman-1/pixman.h | sed 's/xor/c_xor/' > $(srcdir)/pixman.h + +fbrop.h: $(top_srcdir)/fb/fbrop.h + cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fbrop.h + ================================================================ Index: SOURCES/vnc-autotools-compile.patch diff -u /dev/null SOURCES/vnc-autotools-compile.patch:1.1 --- /dev/null Sun Jan 4 18:06:01 2009 +++ SOURCES/vnc-autotools-compile.patch Sun Jan 4 18:05:45 2009 @@ -0,0 +1,11 @@ +--- vnc-4_1_2-unixsrc/common/network/TcpSocket.cxx.autotools-compile 2007-02-15 18:56:52.000000000 +0100 ++++ vnc-4_1_2-unixsrc/common/network/TcpSocket.cxx 2007-02-15 18:57:21.000000000 +0100 +@@ -42,7 +42,7 @@ + #include <rfb/LogWriter.h> + + #ifndef VNC_SOCKLEN_T +-#define VNC_SOCKLEN_T int ++#define VNC_SOCKLEN_T socklen_t + #endif + + #ifndef INADDR_NONE ================================================================ Index: SOURCES/vnc-autotools.patch diff -u /dev/null SOURCES/vnc-autotools.patch:1.1 --- /dev/null Sun Jan 4 18:06:02 2009 +++ SOURCES/vnc-autotools.patch Sun Jan 4 18:05:45 2009 @@ -0,0 +1,427 @@ +--- /dev/null 2007-02-16 09:39:42.585819347 +0100 ++++ vnc-4_1_2-unixsrc/common/Makefile.am 2007-02-16 09:51:11.000000000 +0100 +@@ -0,0 +1,5 @@ ++SUBDIRS = \ ++ rdr \ ++ network \ ++ Xregion \ ++ rfb +--- /dev/null 2007-02-16 09:39:42.585819347 +0100 ++++ vnc-4_1_2-unixsrc/common/rfb/Makefile.am 2007-02-16 09:51:11.000000000 +0100 +@@ -0,0 +1,138 @@ ++lib_LTLIBRARIES = librfb.la ++ ++librfb_la_SOURCES = \ ++ Blacklist.cxx \ ++ Blacklist.h \ ++ CConnection.cxx \ ++ CConnection.h \ ++ CMsgHandler.cxx \ ++ CMsgHandler.h \ ++ CMsgReader.cxx \ ++ CMsgReader.h \ ++ CMsgReaderV3.cxx \ ++ CMsgReaderV3.h \ ++ CMsgWriter.cxx \ ++ CMsgWriter.h \ ++ CMsgWriterV3.cxx \ ++ CMsgWriterV3.h \ ++ ColourCube.h \ ++ ColourMap.h \ ++ ComparingUpdateTracker.cxx \ ++ ComparingUpdateTracker.h \ ++ Configuration.cxx \ ++ Configuration.h \ ++ ConnParams.cxx \ ++ ConnParams.h \ ++ CSecurity.h \ ++ CSecurityNone.h \ ++ CSecurityVncAuth.cxx \ ++ CSecurityVncAuth.h \ ++ Cursor.cxx \ ++ Cursor.h \ ++ Decoder.cxx \ ++ Decoder.h \ ++ d3des.c \ ++ d3des.h \ ++ Encoder.cxx \ ++ Encoder.h \ ++ encodings.cxx \ ++ encodings.h \ ++ Exception.h \ ++ hextileConstants.h \ ++ hextileDecode.h \ ++ HextileDecoder.cxx \ ++ HextileDecoder.h \ ++ hextileEncode.h \ ++ HextileEncoder.cxx \ ++ HextileEncoder.h \ ++ Hostname.h \ ++ HTTPServer.cxx \ ++ HTTPServer.h \ ++ ImageGetter.h \ ++ InputHandler.h \ ++ KeyRemapper.cxx \ ++ KeyRemapper.h \ ++ keysymdef.h \ ++ Logger.cxx \ ++ Logger_file.cxx \ ++ Logger_file.h \ ++ Logger.h \ ++ Logger_stdio.cxx \ ++ Logger_stdio.h \ ++ LogWriter.cxx \ ++ LogWriter.h \ ++ msgTypes.h \ ++ Password.cxx \ ++ Password.h \ ++ PixelBuffer.cxx \ ++ PixelBuffer.h \ ++ PixelFormat.cxx \ ++ PixelFormat.h \ ++ Pixel.h \ ++ RawDecoder.cxx \ ++ RawDecoder.h \ ++ RawEncoder.cxx \ ++ RawEncoder.h \ ++ Rect.h \ ++ Region.cxx \ ++ Region.h \ ++ rreDecode.h \ ++ RREDecoder.cxx \ ++ RREDecoder.h \ ++ rreEncode.h \ ++ RREEncoder.cxx \ ++ RREEncoder.h \ ++ SConnection.cxx \ ++ SConnection.h \ ++ SDesktop.h \ ++ secTypes.cxx \ ++ secTypes.h \ ++ ServerCore.cxx \ ++ ServerCore.h \ ++ SMsgHandler.cxx \ ++ SMsgHandler.h \ ++ SMsgReader.cxx \ ++ SMsgReader.h \ ++ SMsgReaderV3.cxx \ ++ SMsgReaderV3.h \ ++ SMsgWriter.cxx \ ++ SMsgWriter.h \ ++ SMsgWriterV3.cxx \ ++ SMsgWriterV3.h \ ++ SSecurityFactoryStandard.cxx \ ++ SSecurityFactoryStandard.h \ ++ SSecurity.h \ ++ SSecurityNone.h \ ++ SSecurityVncAuth.cxx \ ++ SSecurityVncAuth.h \ ++ Threading.h \ ++ Timer.cxx \ ++ Timer.h \ ++ TransImageGetter.cxx \ ++ TransImageGetter.h \ ++ transInitTempl.h \ ++ transTempl.h \ ++ TrueColourMap.h \ ++ UpdateTracker.cxx \ ++ UpdateTracker.h \ ++ UserPasswdGetter.h \ ++ util.cxx \ ++ util.h \ ++ VNCSConnectionST.cxx \ ++ VNCSConnectionST.h \ ++ VNCServer.h \ ++ VNCServerST.cxx \ ++ VNCServerST.h \ ++ zrleDecode.h \ ++ ZRLEDecoder.cxx \ ++ ZRLEDecoder.h \ ++ zrleEncode.h \ ++ ZRLEEncoder.cxx \ ++ ZRLEEncoder.h ++ ++librfb_la_LIBADD = \ ++ $(top_srcdir)/network/libnetwork.la \ ++ $(top_srcdir)/rdr/librdr.la \ ++ $(top_srcdir)/Xregion/libXregion.la ++ ++librfb_la_CPPFLAGS = -I$(top_srcdir)/../common +--- /dev/null 2007-02-16 09:39:42.585819347 +0100 ++++ vnc-4_1_2-unixsrc/common/rdr/Makefile.am 2007-02-16 09:51:11.000000000 +0100 +@@ -0,0 +1,34 @@ ++noinst_LTLIBRARIES = librdr.la ++ ++librdr_la_SOURCES = \ ++ Exception.cxx \ ++ FdInStream.h \ ++ FixedMemOutStream.h \ ++ HexOutStream.cxx \ ++ InStream.h \ ++ OutStream.h \ ++ SubstitutingInStream.h \ ++ ZlibInStream.h \ ++ Exception.h \ ++ FdOutStream.cxx \ ++ HexInStream.cxx \ ++ HexOutStream.h \ ++ MemInStream.h \ ++ RandomStream.cxx \ ++ types.h \ ++ ZlibOutStream.cxx \ ++ FdInStream.cxx \ ++ FdOutStream.h \ ++ HexInStream.h \ ++ InStream.cxx \ ++ MemOutStream.h \ ++ RandomStream.h \ ++ ZlibInStream.cxx \ ++ ZlibOutStream.h ++ ++librdr_la_LIBADD = \ ++ -lz ++ ++AM_CPPFLAGS = \ ++ -I$(top_srcdir)/../common \ ++ -I$(top_srcdir)/tx +--- /dev/null 2007-02-16 09:39:42.585819347 +0100 ++++ vnc-4_1_2-unixsrc/common/configure.ac 2007-02-16 09:51:11.000000000 +0100 +@@ -0,0 +1,42 @@ ++# -*- Autoconf -*- ++# Process this file with autoconf to produce a configure script. ++ ++AC_PREREQ(2.61) ++AC_INIT([vnc-libs], 4.1.3, [bugzilla.redhat.com]) ++#AC_CONFIG_HEADER([config.h]) ++AM_INIT_AUTOMAKE([-Wall -Werror foreign]) ++ ++# Checks for programs. ++AC_PROG_CXX ++AC_PROG_CC ++AC_PROG_LIBTOOL ++ ++# Checks for libraries. ++ ++# Checks for header files. ++AC_HEADER_STDC ++AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h unistd.h]) ++ ++# Checks for typedefs, structures, and compiler characteristics. ++AC_HEADER_STDBOOL ++AC_C_CONST ++AC_C_INLINE ++AC_TYPE_SIZE_T ++AC_HEADER_TIME ++AC_STRUCT_TM ++ ++# Checks for library functions. ++AC_FUNC_ERROR_AT_LINE ++AC_FUNC_MEMCMP ++AC_FUNC_SELECT_ARGTYPES ++AC_TYPE_SIGNAL ++AC_FUNC_STRFTIME ++AC_FUNC_VPRINTF ++AC_CHECK_FUNCS([ftime gethostbyname getpass gettimeofday inet_ntoa memchr memmove memset select socket strcasecmp strchr strerror strncasecmp]) ++ ++AC_CONFIG_FILES([Makefile ++ Xregion/Makefile ++ network/Makefile ++ rdr/Makefile ++ rfb/Makefile]) ++AC_OUTPUT +--- /dev/null 2007-02-16 09:39:42.585819347 +0100 ++++ vnc-4_1_2-unixsrc/common/Xregion/Makefile.am 2007-02-16 09:51:11.000000000 +0100 +@@ -0,0 +1,6 @@ ++noinst_LTLIBRARIES = libXregion.la ++ ++libXregion_la_SOURCES = \ ++ Region.c \ ++ region.h \ ++ Xregion.h +--- /dev/null 2007-02-16 09:39:42.585819347 +0100 ++++ vnc-4_1_2-unixsrc/common/network/Makefile.am 2007-02-16 09:51:11.000000000 +0100 +@@ -0,0 +1,8 @@ ++noinst_LTLIBRARIES = libnetwork.la ++ ++libnetwork_la_CPPFLAGS = -DHAVE_GETADDRINFO -I$(top_srcdir)/../common ++ ++libnetwork_la_SOURCES = \ ++ Socket.h \ ++ TcpSocket.cxx \ ++ TcpSocket.h +--- /dev/null 2007-02-16 09:39:42.585819347 +0100 ++++ vnc-4_1_2-unixsrc/unix/Makefile.am 2007-02-16 09:51:11.000000000 +0100 +@@ -0,0 +1,6 @@ ++SUBDIRS = \ ++ tx \ ++ vncpasswd \ ++ vncviewer \ ++ vncconfig \ ++ x0vncserver +--- /dev/null 2007-02-16 09:39:42.585819347 +0100 ++++ vnc-4_1_2-unixsrc/unix/tx/Makefile.am 2007-02-16 09:51:11.000000000 +0100 +@@ -0,0 +1,25 @@ ++noinst_LTLIBRARIES = libtx.la ++ ++libtx_la_SOURCES = \ ++ TXButton.h \ ++ TXDialog.h \ ++ TXEntry.h \ ++ TXCheckbox.h \ ++ TXImage.cxx \ ++ TXImage.h \ ++ TXLabel.h \ ++ TXMenu.cxx \ ++ TXMenu.h \ ++ TXMsgBox.h \ ++ TXScrollbar.cxx \ ++ TXScrollbar.h \ ++ TXViewport.cxx \ ++ TXViewport.h \ ++ TXWindow.cxx \ ++ TXWindow.h ++ ++AM_CPPFLAGS = \ ++ -I$(top_srcdir)/../common/ ++ ++libtx_la_LIBADD = \ ++ -lX11 +--- /dev/null 2007-02-16 09:39:42.585819347 +0100 ++++ vnc-4_1_2-unixsrc/unix/vncpasswd/Makefile.am 2007-02-16 09:51:11.000000000 +0100 +@@ -0,0 +1,10 @@ ++bin_PROGRAMS = vncpasswd ++ ++vncpasswd_SOURCES = \ ++ vncpasswd.cxx ++ ++AM_CPPFLAGS = \ ++ -I$(top_srcdir)/../common ++ ++vncpasswd_LDADD = \ ++ $(top_srcdir)/../common/rfb/librfb.la +--- /dev/null 2007-02-16 09:39:42.585819347 +0100 ++++ vnc-4_1_2-unixsrc/unix/vncconfig/Makefile.am 2007-02-16 09:51:11.000000000 +0100 +@@ -0,0 +1,17 @@ ++bin_PROGRAMS = vncconfig ++ ++vncconfig_SOURCES = \ ++ buildtime.c \ ++ QueryConnectDialog.cxx \ ++ QueryConnectDialog.h \ ++ vncconfig.cxx \ ++ vncExt.c \ ++ vncExt.h ++ ++AM_CPPFLAGS = \ ++ -I$(top_srcdir)/../common \ ++ -I$(top_srcdir)/tx ++ ++vncconfig_LDADD = \ ++ $(top_srcdir)/../common/rfb/librfb.la \ ++ $(top_srcdir)/tx/libtx.la +--- /dev/null 2007-02-16 09:39:42.585819347 +0100 ++++ vnc-4_1_2-unixsrc/unix/configure.ac 2007-02-16 09:51:11.000000000 +0100 +@@ -0,0 +1,52 @@ ++# -*- Autoconf -*- ++# Process this file with autoconf to produce a configure script. ++ ++AC_PREREQ(2.61) ++AC_INIT([vnc], 4.1.3, [bugzilla.redhat.com]) ++AC_CONFIG_SRCDIR([x0vncserver/buildtime.c]) ++#AC_CONFIG_HEADER([config.h]) ++AM_INIT_AUTOMAKE([-Wall -Werror foreign]) ++ ++# Checks for programs. ++AC_PROG_CXX ++AC_PROG_CC ++AC_PROG_LIBTOOL ++ ++# Checks for libraries. ++ ++# Checks for header files. ++AC_PATH_X ++AC_HEADER_STDC ++AC_HEADER_SYS_WAIT ++AC_CHECK_HEADERS([fcntl.h stdlib.h string.h strings.h sys/time.h termios.h unistd.h]) ++ ++# Checks for typedefs, structures, and compiler characteristics. ++AC_HEADER_STDBOOL ++AC_C_CONST ++AC_C_INLINE ++AC_C_RESTRICT ++AC_TYPE_SIZE_T ++AC_HEADER_TIME ++ ++# Checks for library functions. ++AC_FUNC_ERROR_AT_LINE ++AC_FUNC_FORK ++AC_FUNC_LSTAT ++AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK ++AC_FUNC_MALLOC ++AC_FUNC_MEMCMP ++AC_FUNC_REALLOC ++AC_FUNC_SELECT_ARGTYPES ++AC_TYPE_SIGNAL ++AC_FUNC_STAT ++AC_FUNC_VPRINTF ++AC_FUNC_WAIT3 ++AC_CHECK_FUNCS([memset mkdir select setenv strchr strdup strerror strspn strtol]) ++ ++AC_CONFIG_FILES([Makefile ++ tx/Makefile ++ vncconfig/Makefile ++ vncpasswd/Makefile ++ vncviewer/Makefile ++ x0vncserver/Makefile]) ++AC_OUTPUT +--- /dev/null 2007-02-16 09:39:42.585819347 +0100 ++++ vnc-4_1_2-unixsrc/unix/vncviewer/Makefile.am 2007-02-16 09:51:11.000000000 +0100 +@@ -0,0 +1,24 @@ ++bin_PROGRAMS = vncviewer ++ ++vncviewer_SOURCES = \ ++ AboutDialog.h \ ++ buildtime.c \ ++ CConn.cxx \ ++ CConn.h \ ++ DesktopWindow.cxx \ ++ DesktopWindow.h \ ++ InfoDialog.h \ ++ OptionsDialog.h \ ++ parameters.h \ ++ PasswdDialog.h \ ++ ServerDialog.h \ ++ vncviewer.cxx ++ ++AM_CPPFLAGS = \ ++ -I$(top_srcdir)/../common \ ++ -I$(top_srcdir)/tx ++ ++vncviewer_LDADD = \ ++ $(top_srcdir)/../common/rfb/librfb.la \ ++ $(top_srcdir)/tx/libtx.la \ ++ -lXext +--- /dev/null 2007-02-16 09:39:42.585819347 +0100 ++++ vnc-4_1_2-unixsrc/unix/x0vncserver/Makefile.am 2007-02-16 09:51:11.000000000 +0100 +@@ -0,0 +1,21 @@ ++bin_PROGRAMS = x0vncserver ++ ++x0vncserver_SOURCES = \ ++ buildtime.c \ ++ Image.cxx \ ++ Image.h \ ++ x0vncserver.cxx \ ++ $(top_srcdir)/vncconfig/QueryConnectDialog.h \ ++ $(top_srcdir)/vncconfig/QueryConnectDialog.cxx ++ ++x0vncserver_CPPFLAGS = \ ++ -I$(top_srcdir)/../common \ ++ -I$(top_srcdir)/vncconfig \ ++ -I$(top_srcdir)/tx \ ++ -I$(top_srcdir) ++ ++x0vncserver_LDADD = \ ++ $(top_srcdir)/../common/rfb/librfb.la \ ++ $(top_srcdir)/tx/libtx.la \ ++ -lXext \ ++ -lXtst ================================================================ Index: SOURCES/vnc-always_use_fb.patch diff -u /dev/null SOURCES/vnc-always_use_fb.patch:1.1 --- /dev/null Sun Jan 4 18:06:02 2009 +++ SOURCES/vnc-always_use_fb.patch Sun Jan 4 18:05:45 2009 @@ -0,0 +1,210 @@ +--- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.always_use_fb 2007-03-05 14:03:21.000000000 +0100 ++++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2007-03-05 14:10:57.000000000 +0100 +@@ -33,27 +33,28 @@ + #include <network/TcpSocket.h> + #include "vncExtInit.h" + ++#ifdef HAVE_DIX_CONFIG_H ++#include <dix-config.h> ++#endif ++ + extern "C" { + #define class c_class + #define public c_public ++#define new c_new + #ifdef WIN32 + #include <X11/Xwinsock.h> + #endif + #include <stdio.h> +-#include "X11/X.h" ++#include <X11/X.h> + #define NEED_EVENTS +-#include "X11/Xproto.h" +-#include "X11/Xos.h" ++#include <X11/Xproto.h> ++#include <X11/Xos.h> + #include "scrnintstr.h" + #include "servermd.h" +-#ifdef VNC_USE_FB + #include "fb.h" +-#else +-#define PSZ 8 +-#include "cfb.h" +-#endif + #include "mi.h" +-#include "mibstore.h" ++#include "micmap.h" ++#include "miline.h" + #include "colormapst.h" + #include "gcstruct.h" + #include "input.h" +@@ -66,24 +67,12 @@ + #endif + #include <X11/XWDFile.h> + #include "dix.h" +-#include "miline.h" + #include "inputstr.h" + #include "keysym.h" + extern int defaultColorVisualClass; ++#undef new + #undef class + #undef public +-#ifndef VNC_USE_FB +- extern Bool cfb16ScreenInit(ScreenPtr, pointer, int, int, int, int, int); +- extern Bool cfb32ScreenInit(ScreenPtr, pointer, int, int, int, int, int); +- extern Bool cfb16CreateGC(GCPtr); +- extern Bool cfb32CreateGC(GCPtr); +- extern void cfb16GetSpans(DrawablePtr, int, DDXPointPtr, int*, int, char*); +- extern void cfb32GetSpans(DrawablePtr, int, DDXPointPtr, int*, int, char*); +- extern void cfb16GetImage(DrawablePtr, int, int, int, int, unsigned int, +- unsigned long, char*); +- extern void cfb32GetImage(DrawablePtr, int, int, int, int, unsigned int, +- unsigned long, char*); +-#endif + } + + #define XVNCVERSION "Free Edition 4.1.2" +@@ -502,67 +491,6 @@ + } + #endif + +-#ifndef VNC_USE_FB +-static Bool vfbMultiDepthCreateGC(GCPtr pGC) +-{ +- switch (vfbBitsPerPixel(pGC->depth)) +- { <<Diff was trimmed, longer than 597 lines>> _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit