Error when building under win7 about python-libevent HOT 6 CLOSED

Author: unknown <hongleij@.(none)>  2011-08-31 09:04:36
Committer: unknown <hongleij@.(none)>  2011-08-31 09:04:36
Parent: 888bd7feaf73606dd4737c617db23ad45024a059 (added missing parameter when calling "evutil_socket_geterror" (GitHub #1))
Branch: master
Follows: v0.9.1
Precedes: 

    build and install under VC2008/Win7

----------------------------------- setup.py -----------------------------------
index 8c5ee69..b8b25e9 100644
@@ -56,16 +56,23 @@ library_dirs = [
 ]
 libraries = [
 ]
-extra_link_args = [
-    os.path.join(LIBEVENT_ROOT, '.libs', 'libevent.a'),
-]
+extra_link_args = [ ]
 if os.name == 'posix':
     # enable thread support
     extra_link_args.extend([
+        os.path.join(LIBEVENT_ROOT, '.libs', 'libevent.a'),
         os.path.join(LIBEVENT_ROOT, '.libs', 'libevent_pthreads.a'),
     ])
     libraries.append('rt')
     libraries.append('pthread')
+elif os.name == 'nt':
+    # enable thread support
+    extra_link_args.extend([
+        os.path.join(LIBEVENT_ROOT,  'libevent.lib'),
+    ])    
+    libraries.append('ws2_32')
+    libraries.append('Advapi32')
+    
 extens = [
     Extension('_libevent', c_files, libraries=libraries,
         include_dirs=include_dirs, library_dirs=library_dirs,

--------------------------------- src/pybase.c ---------------------------------
index 02a2eee..bf80724 100644
@@ -26,6 +26,10 @@

 #include "pybase.h"

+#ifdef WIN32
+  #define suseconds_t long
+#endif
+
 typedef struct _PyConfigObject {
     PyObject_HEAD
     struct event_config *config;

--------------------------------- src/pyhttp.c ---------------------------------
index 4b22e1e..90714e7 100644
@@ -655,11 +655,11 @@ pyhttp_request_send_reply(PyHttpRequestObject *self, PyObject *args)
         evhttp_send_reply(self->request, code, reason, ((PyBufferObject *) data)->buffer);
         Py_END_ALLOW_THREADS
     } else {
+       struct evbuffer *buffer = NULL;
         if (PyObject_AsReadBuffer(pydata, (const void **) &data, &length) != 0) {
             return NULL;
-        }
-        
-        struct evbuffer *buffer = evbuffer_new();
+        }      
+        buffer = evbuffer_new();
         if (buffer == NULL) {
             return PyErr_NoMemory();
         }
@@ -718,11 +718,12 @@ pyhttp_request_send_reply_chunk(PyHttpRequestObject *self, PyObject *args)
         evhttp_send_reply_chunk(self->request, ((PyBufferObject *) data)->buffer);
         Py_END_ALLOW_THREADS
     } else {
+       struct evbuffer *buffer = NULL;
         if (PyObject_AsReadBuffer(pydata, (const void **) &data, &length) != 0) {
             return NULL;
         }

-        struct evbuffer *buffer = evbuffer_new();
+        buffer = evbuffer_new();
         if (buffer == NULL) {
             return PyErr_NoMemory();
         }