compile fix for cygwin

pull/1/head
dscho 20 years ago
parent 11e3f6a6b0
commit 15f3a61eb5

@ -1,3 +1,6 @@
2004-01-16 Johannes E. Schindelin <Johannes.Schindelin@gmx.de>
* compile fix for cygwin
2004-01-09 Karl Runge <runge@karlrunge.com> 2004-01-09 Karl Runge <runge@karlrunge.com>
* x11vnc options -allow, -localhost, -nodragging, -input_skip * x11vnc options -allow, -localhost, -nodragging, -input_skip
* minimize memory usage under -nofb * minimize memory usage under -nofb

@ -53,7 +53,7 @@ rfbProcessArguments(rfbScreenInfoPtr rfbScreen,int* argc, char *argv[])
{ {
int i,i1; int i,i1;
if(!argc) return; if(!argc) return TRUE;
for (i = i1 = 1; i < *argc;) { for (i = i1 = 1; i < *argc;) {
if (strcmp(argv[i], "-help") == 0) { if (strcmp(argv[i], "-help") == 0) {

@ -103,6 +103,10 @@ AC_CHECK_LIB(nsl,gethostbyname)
AC_CHECK_LIB(socket,socket) AC_CHECK_LIB(socket,socket)
AC_CHECK_FUNCS([ftime gethostbyname gethostname gettimeofday inet_ntoa memmove memset mkfifo select socket strchr strcspn strdup strerror strstr setsid]) AC_CHECK_FUNCS([ftime gethostbyname gethostname gettimeofday inet_ntoa memmove memset mkfifo select socket strchr strcspn strdup strerror strstr setsid])
# check, if shmget is in cygipc.a
AC_CHECK_LIB(cygipc,shmget)
AM_CONDITIONAL(CYGIPC, test "$HAVE_CYGIPC" = "true")
# Check if /dev/vcsa1 exists, if so, define LINUX # Check if /dev/vcsa1 exists, if so, define LINUX
AM_CONDITIONAL(LINUX, test -c /dev/vcsa1) AM_CONDITIONAL(LINUX, test -c /dev/vcsa1)

@ -3,11 +3,15 @@ LDADD = ../libvncserver.a
noinst_PROGRAMS=zippy noinst_PROGRAMS=zippy
if CYGIPC
LD_CYGIPC=-lcygipc
endif
if HAVE_X if HAVE_X
bin_PROGRAMS=x11vnc bin_PROGRAMS=x11vnc
x11vnc_SOURCES=x11vnc.c x11vnc_SOURCES=x11vnc.c
INCLUDES=@X_CFLAGS@ INCLUDES=@X_CFLAGS@
x11vnc_LDADD=@X_LIBS@ $(LDADD) x11vnc_LDADD=@X_LIBS@ $(LD_CYGIPC) $(LDADD)
endif endif
zippy_SOURCES=zippy.c zippy_SOURCES=zippy.c

@ -228,7 +228,6 @@ rfbNewTCPOrUDPClient(rfbScreen,sock,isUDP)
rfbClientPtr cl,cl_; rfbClientPtr cl,cl_;
struct sockaddr_in addr; struct sockaddr_in addr;
size_t addrlen = sizeof(struct sockaddr_in); size_t addrlen = sizeof(struct sockaddr_in);
int i;
cl = (rfbClientPtr)calloc(sizeof(rfbClientRec),1); cl = (rfbClientPtr)calloc(sizeof(rfbClientRec),1);
@ -317,8 +316,11 @@ rfbNewTCPOrUDPClient(rfbScreen,sock,isUDP)
#ifdef LIBVNCSERVER_HAVE_LIBJPEG #ifdef LIBVNCSERVER_HAVE_LIBJPEG
cl->tightCompressLevel = TIGHT_DEFAULT_COMPRESSION; cl->tightCompressLevel = TIGHT_DEFAULT_COMPRESSION;
cl->tightQualityLevel = -1; cl->tightQualityLevel = -1;
for (i = 0; i < 4; i++) {
cl->zsActive[i] = FALSE; int i;
for (i = 0; i < 4; i++)
cl->zsActive[i] = FALSE;
}
#endif #endif
cl->enableCursorShapeUpdates = FALSE; cl->enableCursorShapeUpdates = FALSE;

@ -22,6 +22,8 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <rfb/rfbproto.h> #include <rfb/rfbproto.h>
#include "d3des.h" #include "d3des.h"

Loading…
Cancel
Save