changes required to build pica pica on Windows in MSVS2008

git-svn-id: svn://localhost/project_picapica/trunk@202 fb96df88-216d-11de-830c-f3023f12d8ac

1 files changed, 24 insertions, 23 deletions

diff --git a/PICA_client.h b/PICA_client.h
index 1c5d68b..8d9299a 100755
--- a/PICA_client.h
+++ b/PICA_client.h
@@ -1,31 +1,13 @@
 #ifndef PICA_CLIENT_H
 #define PICA_CLIENT_H
 
-#include <openssl/crypto.h>
-#include <openssl/x509.h>
-#include <openssl/pem.h>
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <openssl/bio.h>
-
-
-#ifdef PICA_MULTITHREADED
-
-#define OPENSSL_THREAD_DEFINES
-#include <openssl/opensslconf.h>
-#if defined(OPENSSL_THREADS)
-  // thread support enabled
-#else
-#error "THREAD SUPPORT IS NOT ENABLED IN OPENSSL!"
-#endif
-
-#endif
-
-
 #ifdef WIN32
 
-#include <windows.h>
 #include <winsock2.h>
+#include <ws2tcpip.h>
+#include <windows.h>
+
+typedef unsigned __int16 uint16_t;
 
 #else
 
@@ -45,6 +27,25 @@
 
 #endif
 
+#include <openssl/crypto.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <openssl/bio.h>
+
+#ifdef PICA_MULTITHREADED
+
+#define OPENSSL_THREAD_DEFINES
+#include <openssl/opensslconf.h>
+#if defined(OPENSSL_THREADS)
+  // thread support enabled
+#else
+#error "THREAD SUPPORT IS NOT ENABLED IN OPENSSL!"
+#endif
+
+#endif
+
 //#define PICA_MSGOK 3
 //#define PICA_MSGUTF8 2
 #define PICA_NEWCHAN 1
@@ -79,7 +80,7 @@ struct PICA_chaninfo;
 
 struct PICA_conninfo
 {
-#warning "sockaddr!"
+//#warning "sockaddr!"
 struct sockaddr_in srv_addr; // sockaddr !!
 unsigned int id;
 SSL_CTX* ctx;