support for OS X is better now

pull/1/head
dscho 21 years ago
parent 722577d8ba
commit 0552ea2e6e

@ -74,6 +74,7 @@ AC_C_INLINE
AC_C_BIGENDIAN
AC_TYPE_SIZE_T
AC_HEADER_TIME
AC_HEADER_SYS_WAIT
AC_TYPE_SOCKLEN_T
AC_CREATE_STDINT_H(include/rfbint.h)

@ -4,6 +4,7 @@ endif
if OSX
MAC=mac
mac_LDFLAGS=-framework ApplicationServices -framework Carbon -framework IOKit
endif
noinst_HEADERS=radon.h

@ -27,8 +27,6 @@
*
*/
#define LOCAL_CONTROL
#ifdef LOCAL_CONTROL
#include "1instance.c"
#endif

@ -1,6 +1,6 @@
CONSOLE_SRCS=VNConsole.c
noinst_HEADERS=VNConsole.h
noinst_HEADERS=VNConsole.h vga.h
LDADD=-L.. -lvncserver
INCLUDES=-I. -I../include

@ -1,11 +1,18 @@
#include <stdio.h>
#include <stdlib.h>
#include "VNConsole.h"
#include "vga.h"
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
#include <errno.h>
#include "VNConsole.h"
#include "vga.h"
int main(int argc, char **argv)
@ -45,7 +52,7 @@ int main(int argc, char **argv)
char buffer[1024];
fd_set fs,fs1/*,ifs,ifs1*/;
struct timeval tv,tv1;
int i,c=1,num_fds,max_fd=out[0];
int i,c=1,num_fds,max_fd=out[0],status;
FILE *input_pipe;
vncConsolePtr console=vcGetConsole(&serverArgc,argv,80,25,&vgaFont,FALSE);
if(interactive)
@ -61,7 +68,7 @@ int main(int argc, char **argv)
input_pipe=fdopen(in[1],"w");
setbuf(input_pipe,NULL);
while(c || getpgid(pid)>=0) {
while(c || waitpid(pid,&status,WNOHANG)==0) {
/* event loop */
vcProcessEvents(console);

Loading…
Cancel
Save