Index: vnc_unixsrc/Imakefile diff -c vnc_unixsrc/Imakefile:1.1.1.1 vnc_unixsrc/Imakefile:1.2 *** vnc_unixsrc/Imakefile:1.1.1.1 Thu Sep 14 14:56:03 2000 --- vnc_unixsrc/Imakefile Mon Sep 25 13:56:47 2000 *************** *** 1,12 **** #define IHaveSubdirs #define PassCDebugFlags SUBDIRS = libvncauth vncviewer vncpasswd World: ! make Makefiles ! make depend ! make all @echo "" @echo Built $(SUBDIRS). @echo 'To build Xvnc, do "cd Xvnc", followed by "make World"' --- 1,19 ---- #define IHaveSubdirs #define PassCDebugFlags + #define LIBDIR + export CC=gcc + export EXTRA_LOAD_FLAGS=-Wl,-bnodelcsect + export LINTOPTS=-Wl,-bh + export PICFLAGS=-Wl,-bM\:SRE + export CXXPICFLAGS=-Wl,-bM\:SRE + SUBDIRS = libvncauth vncviewer vncpasswd World: ! make -e Makefiles ! make -e depend ! make -e all @echo "" @echo Built $(SUBDIRS). @echo 'To build Xvnc, do "cd Xvnc", followed by "make World"' Index: vnc_unixsrc/vncserver diff -c vnc_unixsrc/vncserver:1.1.1.1 vnc_unixsrc/vncserver:1.2 *** vnc_unixsrc/vncserver:1.1.1.1 Thu Sep 14 14:56:03 2000 --- vnc_unixsrc/vncserver Fri Sep 22 10:19:12 2000 *************** *** 149,154 **** --- 149,155 ---- # $cmd .= " -fp /usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/"; # $cmd .= " -co /usr/lib/X11/rgb"; # + $cmd .= " -fp /usr/lib/X11/fonts/,/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/,/usr/lib/X11/fonts/100dpi/,/usr/lib/X11/fonts/ibm850/,/usr/lib/X11/fonts/Type1/"; foreach $arg (@ARGV) { $cmd .= " " . "edString($arg); Index: vnc_unixsrc/Xvnc/config/cf/ibm.cf diff -c vnc_unixsrc/Xvnc/config/cf/ibm.cf:1.1.1.1 vnc_unixsrc/Xvnc/config/cf/ibm.cf:1.2 *** vnc_unixsrc/Xvnc/config/cf/ibm.cf:1.1.1.1 Thu Sep 14 14:56:04 2000 --- vnc_unixsrc/Xvnc/config/cf/ibm.cf Fri Sep 22 10:10:07 2000 *************** *** 101,107 **** #define CppCmd /usr/ccs/lib/cpp #define ExpandManNames YES #define ExtensionOSDefines -DXTESTEXT1 ! #define XibmServer YES #define ibmIncludeSKYWAY YES /* IBM cpp has slightly non-standard line directives, but supports -P */ --- 101,107 ---- #define CppCmd /usr/ccs/lib/cpp #define ExpandManNames YES #define ExtensionOSDefines -DXTESTEXT1 ! #define XibmServer NO #define ibmIncludeSKYWAY YES /* IBM cpp has slightly non-standard line directives, but supports -P */ *************** *** 112,120 **** #define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS #define ServerExtraDefines -D_IBM_LFT #if ThreadedX ! #define CcCmd xlc_r #else ! #define CcCmd xlc #endif #define SystemMTDefines /* xlc_r defines -D_THREAD_SAFE */ #define ThreadsLibraries -lpthreads /* xlc_r does -lc_r */ --- 112,120 ---- #define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS #define ServerExtraDefines -D_IBM_LFT #if ThreadedX ! #define CcCmd gcc #else ! #define CcCmd gcc #endif #define SystemMTDefines /* xlc_r defines -D_THREAD_SAFE */ #define ThreadsLibraries -lpthreads /* xlc_r does -lc_r */ *************** *** 128,134 **** #else /* OSMajorVersion < 4 */ #define StandardDefines -DSYSV -DAIXV3 -D_ALL_SOURCE #define ServerExtraDefines -D_IBM_HFT ! #define CcCmd xlc #define ThreadPreStdAPIDefines -DXPRE_STANDARD_API #define SystemMTDefines -D_THREAD_SAFE #define ThreadsLibraries -lpthreads -lc_r --- 128,134 ---- #else /* OSMajorVersion < 4 */ #define StandardDefines -DSYSV -DAIXV3 -D_ALL_SOURCE #define ServerExtraDefines -D_IBM_HFT ! #define CcCmd gcc #define ThreadPreStdAPIDefines -DXPRE_STANDARD_API #define SystemMTDefines -D_THREAD_SAFE #define ThreadsLibraries -lpthreads -lc_r Index: vnc_unixsrc/Xvnc/config/cf/ibmLib.rules diff -c vnc_unixsrc/Xvnc/config/cf/ibmLib.rules:1.1.1.1 vnc_unixsrc/Xvnc/config/cf/ibmLib.rules:1.2 *** vnc_unixsrc/Xvnc/config/cf/ibmLib.rules:1.1.1.1 Thu Sep 14 14:56:04 2000 --- vnc_unixsrc/Xvnc/config/cf/ibmLib.rules Fri Sep 22 10:11:10 2000 *************** *** 23,38 **** # define ShLibIncludeFile #endif #ifndef PositionIndependentCFlags ! # define PositionIndependentCFlags -bM\:SRE #endif #ifndef ExtraLoadFlags ! # define ExtraLoadFlags -bnodelcsect #endif #if !defined(LdPostLib) && !defined(UseInstalled) && OSMajorVersion > 3 # if ThreadedX ! # define LdPostLib -blibpath:$(USRLIBDIRPATH):/usr/lib/threads:/usr/lib:/lib # else ! # define LdPostLib -blibpath:$(USRLIBDIRPATH):/usr/lib:/lib # endif # define SharedLibPostRef $(LDPOSTLIBS) #endif --- 23,38 ---- # define ShLibIncludeFile #endif #ifndef PositionIndependentCFlags ! # define PositionIndependentCFlags -Wl,-bM\:SRE #endif #ifndef ExtraLoadFlags ! # define ExtraLoadFlags -Wl,-bnodelcsect -Wl,-bnoquiet #endif #if !defined(LdPostLib) && !defined(UseInstalled) && OSMajorVersion > 3 # if ThreadedX ! # define LdPostLib -Wl,-blibpath:$(USRLIBDIRPATH):/usr/lib/threads:/usr/lib:/lib # else ! # define LdPostLib -Wl,-blibpath:$(USRLIBDIRPATH):/usr/lib:/lib # endif # define SharedLibPostRef $(LDPOSTLIBS) #endif *************** *** 157,163 **** $(RM) $@~ shr.o shr4.o @@\ (cd down; $(AR) up/$@~ solist) @@\ dump -g $@~ | sed -n -e 's/^[ ]*[0-9][0-9]*[ ]*\([^ .][^ ]*\)$$/\1/p' > $@.syms @@\ ! $(LD) -o shr.o $@~ -H512 -T512 -bM\:SRE -bE\:$@.syms $(REQUIREDLIBS) BaseShLibReqs SharedLibPostRef @@\ $(LN) shr.o shr4.o @@\ $(RM) $@~ @@\ case ,$(SHR4OBJLIBS), in *,libname,*) shr4obj=shr4.o;; esac &&\ @@\ --- 157,163 ---- $(RM) $@~ shr.o shr4.o @@\ (cd down; $(AR) up/$@~ solist) @@\ dump -g $@~ | sed -n -e 's/^[ ]*[0-9][0-9]*[ ]*\([^ .][^ ]*\)$$/\1/p' > $@.syms @@\ ! $(LD) -o shr.o $@~ -H512 -T512 -Wl,-bM\:SRE -Wl,-bE\:$@.syms $(REQUIREDLIBS) BaseShLibReqs SharedLibPostRef @@\ $(LN) shr.o shr4.o @@\ $(RM) $@~ @@\ case ,$(SHR4OBJLIBS), in *,libname,*) shr4obj=shr4.o;; esac &&\ @@\ *************** *** 180,186 **** RemoveFiles($@~ shr.o shr4.o) @@\ (cd down; $(AR) up/$@~ solist) @@\ MakeExportList(libname,libname.imp) @@\ ! $(LD) -o shr.o $@~ -H512 -T512 -bM\:SRE -bE\:libname.imp -bnoentry $(REQUIREDLIBS) BaseShLibReqs $(LDPOSTLIBS) @@\ $(LN) shr.o shr4.o @@\ RemoveFile($@~) @@\ case ,$(SHR4OBJLIBS), in *,libname,*) shr4obj=shr4.o;; esac &&\ @@\ --- 180,186 ---- RemoveFiles($@~ shr.o shr4.o) @@\ (cd down; $(AR) up/$@~ solist) @@\ MakeExportList(libname,libname.imp) @@\ ! $(LD) -o shr.o $@~ -H512 -T512 -Wl,-bM\:SRE -Wl,-bE\:libname.imp -Wl,-bnoentry $(REQUIREDLIBS) BaseShLibReqs $(LDPOSTLIBS) @@\ $(LN) shr.o shr4.o @@\ RemoveFile($@~) @@\ case ,$(SHR4OBJLIBS), in *,libname,*) shr4obj=shr4.o;; esac &&\ @@\ Index: vnc_unixsrc/Xvnc/config/cf/site.def diff -c vnc_unixsrc/Xvnc/config/cf/site.def:1.1.1.1 vnc_unixsrc/Xvnc/config/cf/site.def:1.2 *** vnc_unixsrc/Xvnc/config/cf/site.def:1.1.1.1 Thu Sep 14 14:56:04 2000 --- vnc_unixsrc/Xvnc/config/cf/site.def Fri Sep 22 10:12:53 2000 *************** *** 75,83 **** # endif /* ! #ifndef HasGcc2 ! #define HasGcc2 YES ! #endif */ #endif /* BeforeVendorCF */ --- 75,83 ---- # endif /* ! ifndef HasGcc2 ! define HasGcc2 YES ! endif */ #endif /* BeforeVendorCF */ *************** *** 157,165 **** --- 157,170 ---- /* REMOVE #include + #ifndef UseInstalled + #define UseInstalled YES + #endif + */ /* END ORL VNC modification ================================================================*/ #endif /* AfterVendorCF */ + Index: vnc_unixsrc/Xvnc/config/imake/Makefile.ini diff -c vnc_unixsrc/Xvnc/config/imake/Makefile.ini:1.1.1.1 vnc_unixsrc/Xvnc/config/imake/Makefile.ini:1.2 *** vnc_unixsrc/Xvnc/config/imake/Makefile.ini:1.1.1.1 Thu Sep 14 14:56:05 2000 --- vnc_unixsrc/Xvnc/config/imake/Makefile.ini Fri Sep 22 10:14:25 2000 *************** *** 10,16 **** # $XFree86: xc/config/imake/Makefile.ini,v 3.4.2.1 1997/06/11 12:08:33 dawes Exp $ BOOTSTRAPCFLAGS = ! CC = cc CDEBUGFLAGS = -O INCLUDES = -I../../include -I../../imports/x11/include/X11 CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES) --- 10,16 ---- # $XFree86: xc/config/imake/Makefile.ini,v 3.4.2.1 1997/06/11 12:08:33 dawes Exp $ BOOTSTRAPCFLAGS = ! CC = gcc CDEBUGFLAGS = -O INCLUDES = -I../../include -I../../imports/x11/include/X11 CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES) Index: vnc_unixsrc/Xvnc/programs/Xserver/Xext/xtest1dd.c diff -c vnc_unixsrc/Xvnc/programs/Xserver/Xext/xtest1dd.c:1.1.1.1 vnc_unixsrc/Xvnc/programs/Xserver/Xext/xtest1dd.c:1.2 *** vnc_unixsrc/Xvnc/programs/Xserver/Xext/xtest1dd.c:1.1.1.1 Thu Sep 14 14:56:07 2000 --- vnc_unixsrc/Xvnc/programs/Xserver/Xext/xtest1dd.c Fri Sep 22 10:15:02 2000 *************** *** 405,414 **** --- 405,417 ---- * set up the new input action packing mode */ packed_mode = mode & ~(XTestEXCLUSIVE); + + #ifndef _AIX /* * keep track of where the mouse is */ XTestGetPointerPos(&xtest_mousex, &xtest_mousey); + #endif /* * keep track of which client is getting input actions */ *************** *** 1311,1316 **** --- 1314,1320 ---- * which is called from XTestComputeWaitTime. The * other two types of input actions are processed here. */ + #ifndef _AIX if (action_array[read_index].type == XTestJUMP_ACTION) { XTestJumpPointer( *************** *** 1330,1335 **** --- 1334,1340 ---- mousex, mousey); } + #endif read_index++; /* * if all input actions are processed, then restore Index: vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/httpd.c diff -c vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/httpd.c:1.1.1.1 vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/httpd.c:1.2 *** vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/httpd.c:1.1.1.1 Thu Sep 14 14:56:09 2000 --- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/httpd.c Fri Sep 22 10:15:23 2000 *************** *** 32,37 **** --- 32,46 ---- #include #include + + #ifdef _AIX + #include + #endif + + #ifdef _AIX + #include + #endif + #include "rfb.h" #define NOT_FOUND_STR "HTTP/1.0 404 Not found\n\n" \ Index: vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/sockets.c diff -c vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/sockets.c:1.1.1.1 vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/sockets.c:1.2 *** vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/sockets.c:1.1.1.1 Thu Sep 14 14:56:09 2000 --- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/sockets.c Fri Sep 22 10:16:40 2000 *************** *** 47,52 **** --- 47,57 ---- #include #include + + #ifdef _AIX + #include + #endif + #include "rfb.h" Index: vnc_unixsrc/Xvnc/programs/Xserver/os/osinit.c diff -c vnc_unixsrc/Xvnc/programs/Xserver/os/osinit.c:1.1.1.1 vnc_unixsrc/Xvnc/programs/Xserver/os/osinit.c:1.2 *** vnc_unixsrc/Xvnc/programs/Xserver/os/osinit.c:1.1.1.1 Thu Sep 14 14:56:13 2000 --- vnc_unixsrc/Xvnc/programs/Xserver/os/osinit.c Fri Sep 22 10:18:22 2000 *************** *** 62,67 **** --- 62,71 ---- #endif #endif + #ifdef _AIX + #include + #endif + #if !defined(SYSV) && !defined(AMOEBA) && !defined(_MINIX) && !defined(WIN32) && !defined(Lynx) #include #endif Index: vnc_unixsrc/Xvnc/programs/Xserver/os/utils.c diff -c vnc_unixsrc/Xvnc/programs/Xserver/os/utils.c:1.1.1.1 vnc_unixsrc/Xvnc/programs/Xserver/os/utils.c:1.2 *** vnc_unixsrc/Xvnc/programs/Xserver/os/utils.c:1.1.1.1 Thu Sep 14 14:56:13 2000 --- vnc_unixsrc/Xvnc/programs/Xserver/os/utils.c Fri Sep 22 10:18:48 2000 *************** *** 75,80 **** --- 75,85 ---- #undef _POSIX_SOURCE #endif #endif + + #ifdef _AIX + #include + #endif + #if !defined(SYSV) && !defined(AMOEBA) && !defined(_MINIX) && !defined(WIN32) && !defined(Lynx) #include #endif *************** *** 148,155 **** --- 153,162 ---- #ifdef AIXV3 FILE *aixfd; int SyncOn = 0; + #ifndef AIXV4 extern int SelectWaitTime; #endif + #endif #ifdef DEBUG #ifndef SPECIAL_MALLOC *************** *** 935,940 **** --- 942,948 ---- } #endif #ifdef AIXV3 + #ifndef AIXV4 else if ( strcmp( argv[i], "-timeout") == 0) { if(++i < argc) *************** *** 942,947 **** --- 950,956 ---- else UseMsg(); } + #endif else if ( strcmp( argv[i], "-sync") == 0) { SyncOn++;