Changeset 30

Timestamp:

04/22/08 20:07:08 (9 months ago)

Author:

andreasf

Message:

Updated patch with build fixes for modules.

Files:

• BePorts/trunk/dev-lang/python/python-2.5.x.diff (modified) (1 diff)

BePorts/trunk/dev-lang/python/python-2.5.x.diff

@@ -11598 +11598 @@
-+link /boot/home/config/share/libtool/config.sub
-\ No newline at end of file
+Index: Modules/socketmodule.c
+===================================================================
+--- Modules/socketmodule.c      (revision 62417)
++++ Modules/socketmodule.c      (working copy)
+@@ -244,7 +244,7 @@
+ # include <netdb.h>
+ 
+ /* Headers needed for inet_ntoa() and inet_addr() */
+-# ifdef __BEOS__
++# if defined(__BEOS__) && !defined(__HAIKU__)
+ #  include <net/netdb.h>
+ # elif defined(PYOS_OS2) && defined(PYCC_VACPP)
+ #  include <netdb.h>
+@@ -3740,6 +3740,10 @@
+ \n\
+ Convert a packed IP address of the given family to string format.");
+ 
++#ifndef INET_ADDRSTRLEN
++#define INET_ADDRSTRLEN 16
++#endif
++
+ static PyObject *
+ socket_inet_ntop(PyObject *self, PyObject *args)
+ {
+Index: Modules/socketmodule.h
+===================================================================
+--- Modules/socketmodule.h      (revision 62417)
++++ Modules/socketmodule.h      (working copy)
+@@ -2,7 +2,7 @@
+ 
+ /* Includes needed for the sockaddr_* symbols below */
+ #ifndef MS_WINDOWS
+-#ifdef __VMS
++# ifdef __VMS
+ #   include <socket.h>
+ # else
+ #   include <sys/socket.h>
+@@ -41,6 +41,8 @@
+ #  undef AF_NETLINK
+ #endif
+ 
++#undef HAVE_BLUETOOTH_BLUETOOTH_H
++
+ #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+ #include <bluetooth/bluetooth.h>
+ #include <bluetooth/rfcomm.h>
+Index: Modules/selectmodule.c
+===================================================================
+--- Modules/selectmodule.c      (revision 62417)
++++ Modules/selectmodule.c      (working copy)
+@@ -49,7 +49,7 @@
+ #  include <winsock.h>
+ #else
+ #  define SOCKET int
+-#  ifdef __BEOS__
++#  if defined(__BEOS__) && !defined(__HAIKU__)
+ #    include <net/socket.h>
+ #  elif defined(__VMS)
+ #    include <socket.h>
+Index: Modules/syslogmodule.c
+===================================================================
+--- Modules/syslogmodule.c      (revision 62417)
++++ Modules/syslogmodule.c      (working copy)
+@@ -136,7 +136,11 @@
+        long pri;
+        if (!PyArg_ParseTuple(args, "l:LOG_UPTO", &pri))
+                return NULL;
++#ifdef __HAIKU__
++       mask = 0;
++#else
+        mask = LOG_UPTO(pri);
++#endif
+        return PyInt_FromLong(mask);
+ }
+ 
+Index: Modules/resource.c
+===================================================================
+--- Modules/resource.c  (revision 62417)
++++ Modules/resource.c  (working copy)
+@@ -86,6 +86,7 @@
+                        PyFloat_FromDouble(doubletime(ru.ru_utime)));
+        PyStructSequence_SET_ITEM(result, 1,
+                        PyFloat_FromDouble(doubletime(ru.ru_stime)));
++#ifndef __HAIKU__
+        PyStructSequence_SET_ITEM(result, 2, PyInt_FromLong(ru.ru_maxrss));
+        PyStructSequence_SET_ITEM(result, 3, PyInt_FromLong(ru.ru_ixrss));
+        PyStructSequence_SET_ITEM(result, 4, PyInt_FromLong(ru.ru_idrss));
+@@ -100,6 +101,7 @@
+        PyStructSequence_SET_ITEM(result, 13, PyInt_FromLong(ru.ru_nsignals));
+        PyStructSequence_SET_ITEM(result, 14, PyInt_FromLong(ru.ru_nvcsw));
+        PyStructSequence_SET_ITEM(result, 15, PyInt_FromLong(ru.ru_nivcsw));
++#endif
+ 
+        if (PyErr_Occurred()) {
+                Py_DECREF(result);
+Index: Modules/spwdmodule.c
+===================================================================
+--- Modules/spwdmodule.c        (revision 62417)
++++ Modules/spwdmodule.c        (working copy)
+@@ -79,7 +79,9 @@
+ 
+        SETS(setIndex++, p->sp_namp);
+        SETS(setIndex++, p->sp_pwdp);
++#ifndef __HAIKU__
+        SETI(setIndex++, p->sp_lstchg);
++#endif
+        SETI(setIndex++, p->sp_min);
+        SETI(setIndex++, p->sp_max);
+        SETI(setIndex++, p->sp_warn);