diff -urN Python-2.6.6/Lib/plat-haiku1/IN.py Python-2.6.6-haiku/Lib/plat-haiku1/IN.py --- Python-2.6.6/Lib/plat-haiku1/IN.py 1970-01-01 00:00:00.000000000 +0000 +++ Python-2.6.6-haiku/Lib/plat-haiku1/IN.py 2010-08-30 04:52:27.223346688 +0000 @@ -0,0 +1,327 @@ +# Generated by h2py from /boot/develop/headers/be/net/netinet/in.h + +# Included from socket.h + +# Included from BeBuild.h +B_BEOS_VERSION_4 = 0x0400 +B_BEOS_VERSION_4_5 = 0x0450 +B_BEOS_VERSION_5 = 0x0500 +B_BEOS_VERSION = B_BEOS_VERSION_5 +B_BEOS_VERSION_MAUI = B_BEOS_VERSION_5 +_PR2_COMPATIBLE_ = 1 +_PR3_COMPATIBLE_ = 1 +_R4_COMPATIBLE_ = 1 +_R4_5_COMPATIBLE_ = 1 +_PR2_COMPATIBLE_ = 0 +_PR3_COMPATIBLE_ = 0 +_R4_COMPATIBLE_ = 1 +_R4_5_COMPATIBLE_ = 1 +def _UNUSED(x): return x + + +# Included from sys/types.h + +# Included from time.h + +# Included from be_setup.h +def __std(ref): return ref + +__be_os = 2 +__dest_os = __be_os +__MSL__ = 0x4011 +__GLIBC__ = -2 +__GLIBC_MINOR__ = 1 + +# Included from null.h +NULL = (0) +NULL = 0L + +# Included from size_t.h + +# Included from stddef.h + +# Included from wchar_t.h +CLOCKS_PER_SEC = 1000 +CLK_TCK = CLOCKS_PER_SEC +MAX_TIMESTR = 70 + +# Included from sys/time.h + +# Included from ByteOrder.h + +# Included from endian.h +__LITTLE_ENDIAN = 1234 +LITTLE_ENDIAN = __LITTLE_ENDIAN +__BYTE_ORDER = __LITTLE_ENDIAN +BYTE_ORDER = __BYTE_ORDER +__BIG_ENDIAN = 0 +BIG_ENDIAN = 0 +__BIG_ENDIAN = 4321 +BIG_ENDIAN = __BIG_ENDIAN +__BYTE_ORDER = __BIG_ENDIAN +BYTE_ORDER = __BYTE_ORDER +__LITTLE_ENDIAN = 0 +LITTLE_ENDIAN = 0 +__PDP_ENDIAN = 3412 +PDP_ENDIAN = __PDP_ENDIAN + +# Included from SupportDefs.h + +# Included from Errors.h + +# Included from limits.h + +# Included from float.h +FLT_ROUNDS = 1 +FLT_RADIX = 2 +FLT_MANT_DIG = 24 +FLT_DIG = 6 +FLT_MIN_EXP = (-125) +FLT_MIN_10_EXP = (-37) +FLT_MAX_EXP = 128 +FLT_MAX_10_EXP = 38 +DBL_MANT_DIG = 53 +DBL_DIG = 15 +DBL_MIN_EXP = (-1021) +DBL_MIN_10_EXP = (-308) +DBL_MAX_EXP = 1024 +DBL_MAX_10_EXP = 308 +LDBL_MANT_DIG = DBL_MANT_DIG +LDBL_DIG = DBL_DIG +LDBL_MIN_EXP = DBL_MIN_EXP +LDBL_MIN_10_EXP = DBL_MIN_10_EXP +LDBL_MAX_EXP = DBL_MAX_EXP +LDBL_MAX_10_EXP = DBL_MAX_10_EXP +CHAR_BIT = (8) +SCHAR_MIN = (-127-1) +SCHAR_MAX = (127) +CHAR_MIN = SCHAR_MIN +CHAR_MAX = SCHAR_MAX +MB_LEN_MAX = (1) +SHRT_MIN = (-32767-1) +SHRT_MAX = (32767) +LONG_MIN = (-2147483647L-1) +LONG_MAX = (2147483647L) +INT_MIN = LONG_MIN +INT_MAX = LONG_MAX +ARG_MAX = (32768) +ATEXIT_MAX = (32) +CHILD_MAX = (1024) +IOV_MAX = (256) +FILESIZEBITS = (64) +LINK_MAX = (1) +LOGIN_NAME_MAX = (32) +MAX_CANON = (255) +MAX_INPUT = (255) +NAME_MAX = (256) +NGROUPS_MAX = (32) +OPEN_MAX = (128) +PATH_MAX = (1024) +PIPE_MAX = (512) +SSIZE_MAX = (2147483647L) +TTY_NAME_MAX = (256) +TZNAME_MAX = (32) +SYMLINKS_MAX = (16) +_POSIX_ARG_MAX = (32768) +_POSIX_CHILD_MAX = (1024) +_POSIX_LINK_MAX = (1) +_POSIX_LOGIN_NAME_MAX = (9) +_POSIX_MAX_CANON = (255) +_POSIX_MAX_INPUT = (255) +_POSIX_NAME_MAX = (255) +_POSIX_NGROUPS_MAX = (0) +_POSIX_OPEN_MAX = (128) +_POSIX_PATH_MAX = (1024) +_POSIX_PIPE_BUF = (512) +_POSIX_SSIZE_MAX = (2147483647L) +_POSIX_STREAM_MAX = (8) +_POSIX_TTY_NAME_MAX = (256) +_POSIX_TZNAME_MAX = (3) +B_GENERAL_ERROR_BASE = LONG_MIN +B_OS_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x1000 +B_APP_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x2000 +B_INTERFACE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x3000 +B_MEDIA_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x4000 +B_TRANSLATION_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x4800 +B_MIDI_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x5000 +B_STORAGE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x6000 +B_POSIX_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x7000 +B_MAIL_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x8000 +B_PRINT_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x9000 +B_DEVICE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0xa000 +B_ERRORS_END = (B_GENERAL_ERROR_BASE + 0xffff) +E2BIG = (B_POSIX_ERROR_BASE + 1) +ECHILD = (B_POSIX_ERROR_BASE + 2) +EDEADLK = (B_POSIX_ERROR_BASE + 3) +EFBIG = (B_POSIX_ERROR_BASE + 4) +EMLINK = (B_POSIX_ERROR_BASE + 5) +ENFILE = (B_POSIX_ERROR_BASE + 6) +ENODEV = (B_POSIX_ERROR_BASE + 7) +ENOLCK = (B_POSIX_ERROR_BASE + 8) +ENOSYS = (B_POSIX_ERROR_BASE + 9) +ENOTTY = (B_POSIX_ERROR_BASE + 10) +ENXIO = (B_POSIX_ERROR_BASE + 11) +ESPIPE = (B_POSIX_ERROR_BASE + 12) +ESRCH = (B_POSIX_ERROR_BASE + 13) +EFPOS = (B_POSIX_ERROR_BASE + 14) +ESIGPARM = (B_POSIX_ERROR_BASE + 15) +EDOM = (B_POSIX_ERROR_BASE + 16) +ERANGE = (B_POSIX_ERROR_BASE + 17) +EPROTOTYPE = (B_POSIX_ERROR_BASE + 18) +EPROTONOSUPPORT = (B_POSIX_ERROR_BASE + 19) +EPFNOSUPPORT = (B_POSIX_ERROR_BASE + 20) +EAFNOSUPPORT = (B_POSIX_ERROR_BASE + 21) +EADDRINUSE = (B_POSIX_ERROR_BASE + 22) +EADDRNOTAVAIL = (B_POSIX_ERROR_BASE + 23) +ENETDOWN = (B_POSIX_ERROR_BASE + 24) +ENETUNREACH = (B_POSIX_ERROR_BASE + 25) +ENETRESET = (B_POSIX_ERROR_BASE + 26) +ECONNABORTED = (B_POSIX_ERROR_BASE + 27) +ECONNRESET = (B_POSIX_ERROR_BASE + 28) +EISCONN = (B_POSIX_ERROR_BASE + 29) +ENOTCONN = (B_POSIX_ERROR_BASE + 30) +ESHUTDOWN = (B_POSIX_ERROR_BASE + 31) +ECONNREFUSED = (B_POSIX_ERROR_BASE + 32) +EHOSTUNREACH = (B_POSIX_ERROR_BASE + 33) +ENOPROTOOPT = (B_POSIX_ERROR_BASE + 34) +ENOBUFS = (B_POSIX_ERROR_BASE + 35) +EINPROGRESS = (B_POSIX_ERROR_BASE + 36) +EALREADY = (B_POSIX_ERROR_BASE + 37) +EILSEQ = (B_POSIX_ERROR_BASE + 38) +ENOMSG = (B_POSIX_ERROR_BASE + 39) +ESTALE = (B_POSIX_ERROR_BASE + 40) +EOVERFLOW = (B_POSIX_ERROR_BASE + 41) +EMSGSIZE = (B_POSIX_ERROR_BASE + 42) +EOPNOTSUPP = (B_POSIX_ERROR_BASE + 43) +ENOTSOCK = (B_POSIX_ERROR_BASE + 44) +false = 0 +true = 1 +NULL = (0) +FALSE = 0 +TRUE = 1 + +# Included from TypeConstants.h +B_HOST_IS_LENDIAN = 1 +B_HOST_IS_BENDIAN = 0 +def B_HOST_TO_LENDIAN_DOUBLE(arg): return (double)(arg) + +def B_HOST_TO_LENDIAN_FLOAT(arg): return (float)(arg) + +def B_HOST_TO_LENDIAN_INT64(arg): return (uint64)(arg) + +def B_HOST_TO_LENDIAN_INT32(arg): return (uint32)(arg) + +def B_HOST_TO_LENDIAN_INT16(arg): return (uint16)(arg) + +def B_HOST_TO_BENDIAN_DOUBLE(arg): return __swap_double(arg) + +def B_HOST_TO_BENDIAN_FLOAT(arg): return __swap_float(arg) + +def B_HOST_TO_BENDIAN_INT64(arg): return __swap_int64(arg) + +def B_HOST_TO_BENDIAN_INT32(arg): return __swap_int32(arg) + +def B_HOST_TO_BENDIAN_INT16(arg): return __swap_int16(arg) + +def B_LENDIAN_TO_HOST_DOUBLE(arg): return (double)(arg) + +def B_LENDIAN_TO_HOST_FLOAT(arg): return (float)(arg) + +def B_LENDIAN_TO_HOST_INT64(arg): return (uint64)(arg) + +def B_LENDIAN_TO_HOST_INT32(arg): return (uint32)(arg) + +def B_LENDIAN_TO_HOST_INT16(arg): return (uint16)(arg) + +def B_BENDIAN_TO_HOST_DOUBLE(arg): return __swap_double(arg) + +def B_BENDIAN_TO_HOST_FLOAT(arg): return __swap_float(arg) + +def B_BENDIAN_TO_HOST_INT64(arg): return __swap_int64(arg) + +def B_BENDIAN_TO_HOST_INT32(arg): return __swap_int32(arg) + +def B_BENDIAN_TO_HOST_INT16(arg): return __swap_int16(arg) + +B_HOST_IS_LENDIAN = 0 +B_HOST_IS_BENDIAN = 1 +def B_HOST_TO_LENDIAN_DOUBLE(arg): return __swap_double(arg) + +def B_HOST_TO_LENDIAN_FLOAT(arg): return __swap_float(arg) + +def B_HOST_TO_LENDIAN_INT64(arg): return __swap_int64(arg) + +def B_HOST_TO_LENDIAN_INT32(arg): return __swap_int32(arg) + +def B_HOST_TO_LENDIAN_INT16(arg): return __swap_int16(arg) + +def B_HOST_TO_BENDIAN_DOUBLE(arg): return (double)(arg) + +def B_HOST_TO_BENDIAN_FLOAT(arg): return (float)(arg) + +def B_HOST_TO_BENDIAN_INT64(arg): return (uint64)(arg) + +def B_HOST_TO_BENDIAN_INT32(arg): return (uint32)(arg) + +def B_HOST_TO_BENDIAN_INT16(arg): return (uint16)(arg) + +def B_LENDIAN_TO_HOST_DOUBLE(arg): return __swap_double(arg) + +def B_LENDIAN_TO_HOST_FLOAT(arg): return __swap_float(arg) + +def B_LENDIAN_TO_HOST_INT64(arg): return __swap_int64(arg) + +def B_LENDIAN_TO_HOST_INT32(arg): return __swap_int32(arg) + +def B_LENDIAN_TO_HOST_INT16(arg): return __swap_int16(arg) + +def B_BENDIAN_TO_HOST_DOUBLE(arg): return (double)(arg) + +def B_BENDIAN_TO_HOST_FLOAT(arg): return (float)(arg) + +def B_BENDIAN_TO_HOST_INT64(arg): return (uint64)(arg) + +def B_BENDIAN_TO_HOST_INT32(arg): return (uint32)(arg) + +def B_BENDIAN_TO_HOST_INT16(arg): return (uint16)(arg) + +def B_SWAP_DOUBLE(arg): return __swap_double(arg) + +def B_SWAP_FLOAT(arg): return __swap_float(arg) + +def B_SWAP_INT64(arg): return __swap_int64(arg) + +def B_SWAP_INT32(arg): return __swap_int32(arg) + +def B_SWAP_INT16(arg): return __swap_int16(arg) + +def htonl(x): return B_HOST_TO_BENDIAN_INT32(x) + +def ntohl(x): return B_BENDIAN_TO_HOST_INT32(x) + +def htons(x): return B_HOST_TO_BENDIAN_INT16(x) + +def ntohs(x): return B_BENDIAN_TO_HOST_INT16(x) + +AF_INET = 1 +INADDR_ANY = 0x00000000 +INADDR_BROADCAST = 0xffffffff +INADDR_LOOPBACK = 0x7f000001 +SOL_SOCKET = 1 +SO_DEBUG = 1 +SO_REUSEADDR = 2 +SO_NONBLOCK = 3 +SO_REUSEPORT = 4 +MSG_OOB = 0x1 +SOCK_DGRAM = 1 +SOCK_STREAM = 2 +IPPROTO_UDP = 1 +IPPROTO_TCP = 2 +IPPROTO_ICMP = 3 +B_UDP_MAX_SIZE = (65536 - 1024) +FD_SETSIZE = 256 +FDSETSIZE = FD_SETSIZE +NFDBITS = 32 +def _FDMSKNO(fd): return ((fd) / NFDBITS) + +def _FDBITNO(fd): return ((fd) % NFDBITS) diff -urN Python-2.6.6/Lib/plat-haiku1/regen Python-2.6.6-haiku/Lib/plat-haiku1/regen --- Python-2.6.6/Lib/plat-haiku1/regen 1970-01-01 00:00:00.000000000 +0000 +++ Python-2.6.6-haiku/Lib/plat-haiku1/regen 2010-08-30 04:52:27.237502464 +0000 @@ -0,0 +1,7 @@ +#! /bin/sh + +H2PY=../../Tools/scripts/h2py.py +HEADERS=/boot/develop/headers + +set -v +python $H2PY -i '(u_long)' $HEADERS/posix/netinet/in.h diff -urN Python-2.6.6/Modules/resource.c Python-2.6.6-haiku/Modules/resource.c --- Python-2.6.6/Modules/resource.c 2010-05-09 15:15:40.053739520 +0000 +++ Python-2.6.6-haiku/Modules/resource.c 2010-08-30 04:52:24.666370048 +0000 @@ -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,7 +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); return NULL; diff -urN Python-2.6.6/Modules/socketmodule.c Python-2.6.6-haiku/Modules/socketmodule.c --- Python-2.6.6/Modules/socketmodule.c 2010-05-23 15:22:08.054525952 +0000 +++ Python-2.6.6-haiku/Modules/socketmodule.c 2010-08-30 04:53:35.429916160 +0000 @@ -4661,7 +4661,9 @@ #ifndef __BEOS__ /* We have incomplete socket support. */ PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW); - PyModule_AddIntConstant(m, "SOCK_SEQPACKET", SOCK_SEQPACKET); +#ifndef __HAIKU__ + PyModule_AddIntConstant(m, "SOCK_SEQPACKET", SOCK_SEQPACKET); +#endif #if defined(SOCK_RDM) PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM); #endif diff -urN Python-2.6.6/Modules/socketmodule.h Python-2.6.6-haiku/Modules/socketmodule.h --- Python-2.6.6/Modules/socketmodule.h 2010-05-09 15:15:40.053739520 +0000 +++ Python-2.6.6-haiku/Modules/socketmodule.h 2010-08-30 04:52:24.667942912 +0000 @@ -47,6 +47,10 @@ # undef AF_NETLINK #endif +#if defined(__HAIKU__) +#undef HAVE_BLUETOOTH_BLUETOOTH_H +#endif + #ifdef HAVE_BLUETOOTH_BLUETOOTH_H #include #include diff -urN Python-2.6.6/Modules/spwdmodule.c Python-2.6.6-haiku/Modules/spwdmodule.c --- Python-2.6.6/Modules/spwdmodule.c 2010-05-09 15:15:40.030408704 +0000 +++ Python-2.6.6-haiku/Modules/spwdmodule.c 2010-08-30 04:52:24.709623808 +0000 @@ -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); diff -urN Python-2.6.6/Modules/timemodule.c Python-2.6.6-haiku/Modules/timemodule.c --- Python-2.6.6/Modules/timemodule.c 2010-05-09 15:15:40.015204352 +0000 +++ Python-2.6.6-haiku/Modules/timemodule.c 2010-08-30 04:52:24.721944576 +0000 @@ -968,11 +968,11 @@ return -1; } Py_END_ALLOW_THREADS -#elif defined(__BEOS__) +#elif defined(__BEOS__) || defined(__HAIKU__) /* This sleep *CAN BE* interrupted. */ { if( secs <= 0.0 ) { - return; + return 0; } Py_BEGIN_ALLOW_THREADS diff -urN Python-2.6.6/Parser/asdl_c.py Python-2.6.6-haiku/Parser/asdl_c.py --- Python-2.6.6/Parser/asdl_c.py 2009-12-13 00:59:01.059768832 +0000 +++ Python-2.6.6-haiku/Parser/asdl_c.py 2010-08-30 04:52:27.169607168 +0000 @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /bin/env python """Generate C code from an ASDL description.""" # TO DO diff -urN Python-2.6.6/Python/bltinmodule.c Python-2.6.6-haiku/Python/bltinmodule.c --- Python-2.6.6/Python/bltinmodule.c 2010-05-09 15:15:40.065011712 +0000 +++ Python-2.6.6-haiku/Python/bltinmodule.c 2010-08-30 04:52:27.186646528 +0000 @@ -18,7 +18,7 @@ */ #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T) const char *Py_FileSystemDefaultEncoding = "mbcs"; -#elif defined(__APPLE__) +#elif defined(__APPLE__) || defined(__HAIKU__) const char *Py_FileSystemDefaultEncoding = "utf-8"; #else const char *Py_FileSystemDefaultEncoding = NULL; /* use default */ diff -urN Python-2.6.6/Tools/scripts/h2py.py Python-2.6.6-haiku/Tools/scripts/h2py.py --- Python-2.6.6/Tools/scripts/h2py.py 2004-08-09 17:27:55.066584576 +0000 +++ Python-2.6.6-haiku/Tools/scripts/h2py.py 2010-08-30 04:52:27.188219392 +0000 @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /bin/env python # Read #define's and translate to Python code. # Handle #include statements. @@ -50,7 +50,7 @@ searchdirs=os.environ['INCLUDE'].split(';') except KeyError: try: - if sys.platform.find("beos") == 0: + if sys.platform.find("beos") == 0 or sys.platform.find("haiku1") == 0: searchdirs=os.environ['BEINCLUDES'].split(';') elif sys.platform.startswith("atheos"): searchdirs=os.environ['C_INCLUDE_PATH'].split(':') diff -urN Python-2.6.6/configure.in Python-2.6.6-haiku/configure.in --- Python-2.6.6/configure.in 2010-05-25 02:27:03.064225280 +0000 +++ Python-2.6.6-haiku/configure.in 2010-08-30 04:52:27.207880192 +0000 @@ -745,7 +745,7 @@ RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} INSTSONAME="$LDLIBRARY".$SOVERSION ;; - Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) + Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|Haiku*) LDLIBRARY='libpython$(VERSION).so' BLDLIBRARY='-L. -lpython$(VERSION)' RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} @@ -823,7 +823,7 @@ AC_SUBST(LN) if test -z "$LN" ; then case $ac_sys_system in - BeOS*) LN="ln -s";; + BeOS*|Haiku*) LN="ln -s";; CYGWIN*) LN="ln -s";; atheos*) LN="ln -s";; *) LN=ln;; @@ -1829,7 +1829,7 @@ fi fi ;; - Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';; + Linux*|GNU*|QNX*|Haiku*) LDSHARED='$(CC) -shared';; BSD/OS*/4*) LDSHARED="gcc -shared";; FreeBSD*) if [[ "`$CC -dM -E -