win64 fix

git-svn-id: file:///raid/svn-personal/tewi/trunk@14 8739d7e6-ffea-ec47-b151-bdff447c6205

diff --git a/Server/Makefile b/Server/Makefile
index 7156fa84fde4a4b89d3b5fc01fd9837a2bb3cac7..a2ef9e8c0138ad6406d799f5c8853b49ddf2e6ef 100644 (file)
--- a/Server/Makefile
+++ b/Server/Makefile
@@ -10,7 +10,7 @@ OBJS = version.o main.o config.o server.o ssl.o
 all: tewi$(EXEC)
 
 tewi$(EXEC): $(OBJS) ../Common/common.a
-       $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) ../Common/common.a -lssl -lcrypto
+       $(CC) $(LDFLAGS) -o $@ $(OBJS) -lssl -lcrypto $(LIBS) ../Common/common.a
 
 .c.o:
        $(CC) $(CFLAGS) -c -o $@ $<

diff --git a/Server/server.c b/Server/server.c
index ef4d475e9ccd5960b4c1ea542523c12084f47b48..0690d27faa2021b09e5b5bc96cdfc9f50b75a125 100644 (file)
--- a/Server/server.c
+++ b/Server/server.c
@@ -122,7 +122,7 @@ struct pass_entry {
 unsigned int WINAPI tw_server_pass(void* ptr) {
        int sock = ((struct pass_entry*)ptr)->sock;
        bool ssl = ((struct pass_entry*)ptr)->ssl;
-       int port = ((struct pass_entry*)ptR)->port;
+       int port = ((struct pass_entry*)ptr)->port;
        free(ptr);
 #else
 void tw_server_pass(int sock, bool ssl, int port) {