diff options
author | jsorg71 <jsorg71> | 2004-09-30 02:58:09 +0000 |
---|---|---|
committer | jsorg71 <jsorg71> | 2004-09-30 02:58:09 +0000 |
commit | 5d8d552ebab10176880163dc6453a28a6fb7c6bd (patch) | |
tree | 8a5ee721b5bd1574f1716fef52101e004251e5f7 | |
parent | 8a0a25f9c2b498e47996f0ec403320d46a0b751b (diff) | |
download | xrdp-proprietary-5d8d552ebab10176880163dc6453a28a6fb7c6bd.tar.gz xrdp-proprietary-5d8d552ebab10176880163dc6453a28a6fb7c6bd.zip |
IRIX compile changes
-rw-r--r-- | xrdp/Makefile | 3 | ||||
-rw-r--r-- | xrdp/os_calls.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/xrdp/Makefile b/xrdp/Makefile index 69cb95b0..9898415a 100644 --- a/xrdp/Makefile +++ b/xrdp/Makefile @@ -4,12 +4,13 @@ XRDPOBJ = xrdp.o os_calls.o xrdp_tcp.o xrdp_iso.o xrdp_mcs.o xrdp_sec.o xrdp_rdp xrdp_painter.o xrdp_list.o xrdp_region.o xrdp_cache.o xrdp_font.o #CFLAGS = -Wall -O2 -DXRDP_DEBUG CFLAGS = -Wall -O2 +LDFLAGS = -L /usr/gnu/lib -lpthread -lcrypto CC = gcc all: xrdp xrdp: $(XRDPOBJ) - $(CC) -o xrdp $(XRDPOBJ) -lpthread -lcrypto + $(CC) $(LDFLAGS) -o xrdp $(XRDPOBJ) clean: rm -f *.o xrdp diff --git a/xrdp/os_calls.c b/xrdp/os_calls.c index 05e05dac..66cd4f2e 100644 --- a/xrdp/os_calls.c +++ b/xrdp/os_calls.c @@ -32,6 +32,7 @@ #include <netinet/tcp.h> #include <sys/types.h> #include <sys/socket.h> +#include <sys/time.h> #include <openssl/rc4.h> #include <openssl/md5.h> #include <openssl/sha.h> @@ -258,11 +259,11 @@ int g_tcp_listen(int sck) int g_tcp_accept(int sck) { struct sockaddr_in s; - int i; + unsigned int i; i = sizeof(struct sockaddr_in); memset(&s, 0, i); - return accept(sck, (struct sockaddr*)&s, (socklen_t*)&i); + return accept(sck, (struct sockaddr*)&s, &i); } /*****************************************************************************/ |