xpra icon
Bug tracker and wiki

This bug tracker and wiki are being discontinued
please use https://github.com/Xpra-org/xpra instead.


Ticket #878: python-lz4-win32.patch

File python-lz4-win32.patch, 9.9 KB (added by Antoine Martin, 6 years ago)

quick and dirty patch for building on win32

  • python-lz4-0.8.0-rc1

    diff -urN python-lz4-0.8.0-rc1/setup.py python-lz4-0.8.0-rc1.win32/setup.py
    old new  
    2121            'src/lz4.c',
    2222            'src/lz4hc.c',
    2323            'src/python-lz4.c'
    24         ], extra_compile_args=[
    25             "-std=c99",
    26             "-O3",
    27             "-Wall",
    28             "-W",
    29             "-Wundef",
    30             "-DVERSION=\"%s\"" % VERSION_STR,
    31             "-DLZ4_VERSION=\"r130\"",
    32         ])
     24        ], extra_compile_args=["/Ot", "/Wall"]
     25        )
    3326    ],
    3427    setup_requires=["nose>=1.0"],
    3528    test_suite = "nose.collector",
  • python-lz4-0.8.0-rc1

    diff -urN python-lz4-0.8.0-rc1/src/python-lz4.c python-lz4-0.8.0-rc1.win32/src/python-lz4.c
    old new  
    3131
    3232#include <Python.h>
    3333#include <stdlib.h>
    34 #include <stdint.h>
     34#include "stdint.h"
    3535#include <math.h>
    3636#include "lz4.h"
    3737#include "lz4hc.h"
     
    237237        Py_DECREF(module);
    238238        INITERROR;
    239239    }
    240 
    241     PyModule_AddStringConstant(module, "VERSION", VERSION);
    242     PyModule_AddStringConstant(module, "__version__", VERSION);
    243     PyModule_AddStringConstant(module, "LZ4_VERSION", LZ4_VERSION);
     240    PyModule_AddStringConstant(module, "VERSION", "0.8.0");
     241    PyModule_AddStringConstant(module, "__version__", "0.8.0");
     242    PyModule_AddStringConstant(module, "LZ4_VERSION", "r130");
    244243
    245244#if PY_MAJOR_VERSION >= 3
    246245    return module;
  • python-lz4-0.8.0-rc1

    diff -urN python-lz4-0.8.0-rc1/src/stdint.h python-lz4-0.8.0-rc1.win32/src/stdint.h
    old new  
     1// ISO C9x  compliant stdint.h for Microsoft Visual Studio
     2// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124
     3//
     4//  Copyright (c) 2006-2008 Alexander Chemeris
     5//
     6// Redistribution and use in source and binary forms, with or without
     7// modification, are permitted provided that the following conditions are met:
     8//
     9//   1. Redistributions of source code must retain the above copyright notice,
     10//      this list of conditions and the following disclaimer.
     11//
     12//   2. Redistributions in binary form must reproduce the above copyright
     13//      notice, this list of conditions and the following disclaimer in the
     14//      documentation and/or other materials provided with the distribution.
     15//
     16//   3. The name of the author may be used to endorse or promote products
     17//      derived from this software without specific prior written permission.
     18//
     19// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
     20// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
     21// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
     22// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
     23// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
     24// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
     25// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
     26// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
     27// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
     28// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     29//
     30///////////////////////////////////////////////////////////////////////////////
     31
     32#ifndef _MSC_VER // [
     33#error "Use this header only with Microsoft Visual C++ compilers!"
     34#endif // _MSC_VER ]
     35
     36#ifndef _MSC_STDINT_H_ // [
     37#define _MSC_STDINT_H_
     38
     39#if _MSC_VER > 1000
     40#pragma once
     41#endif
     42
     43#include <limits.h>
     44
     45// For Visual Studio 6 in C++ mode and for many Visual Studio versions when
     46// compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}'
     47// or compiler give many errors like this:
     48//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
     49#ifdef __cplusplus
     50extern "C" {
     51#endif
     52#  include <wchar.h>
     53#ifdef __cplusplus
     54}
     55#endif
     56
     57// Define _W64 macros to mark types changing their size, like intptr_t.
     58#ifndef _W64
     59#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
     60#     define _W64 __w64
     61#  else
     62#     define _W64
     63#  endif
     64#endif
     65
     66
     67// 7.18.1 Integer types
     68
     69// 7.18.1.1 Exact-width integer types
     70
     71// Visual Studio 6 and Embedded Visual C++ 4 doesn't
     72// realize that, e.g. char has the same size as __int8
     73// so we give up on __intX for them.
     74#if (_MSC_VER < 1300)
     75   typedef signed char       int8_t;
     76   typedef signed short      int16_t;
     77   typedef signed int        int32_t;
     78   typedef unsigned char     uint8_t;
     79   typedef unsigned short    uint16_t;
     80   typedef unsigned int      uint32_t;
     81#else
     82   typedef signed __int8     int8_t;
     83   typedef signed __int16    int16_t;
     84   typedef signed __int32    int32_t;
     85   typedef unsigned __int8   uint8_t;
     86   typedef unsigned __int16  uint16_t;
     87   typedef unsigned __int32  uint32_t;
     88#endif
     89typedef signed __int64       int64_t;
     90typedef unsigned __int64     uint64_t;
     91
     92
     93// 7.18.1.2 Minimum-width integer types
     94typedef int8_t    int_least8_t;
     95typedef int16_t   int_least16_t;
     96typedef int32_t   int_least32_t;
     97typedef int64_t   int_least64_t;
     98typedef uint8_t   uint_least8_t;
     99typedef uint16_t  uint_least16_t;
     100typedef uint32_t  uint_least32_t;
     101typedef uint64_t  uint_least64_t;
     102
     103// 7.18.1.3 Fastest minimum-width integer types
     104typedef int8_t    int_fast8_t;
     105typedef int16_t   int_fast16_t;
     106typedef int32_t   int_fast32_t;
     107typedef int64_t   int_fast64_t;
     108typedef uint8_t   uint_fast8_t;
     109typedef uint16_t  uint_fast16_t;
     110typedef uint32_t  uint_fast32_t;
     111typedef uint64_t  uint_fast64_t;
     112
     113// 7.18.1.4 Integer types capable of holding object pointers
     114#ifdef _WIN64 // [
     115   typedef signed __int64    intptr_t;
     116   typedef unsigned __int64  uintptr_t;
     117#else // _WIN64 ][
     118   typedef _W64 signed int   intptr_t;
     119   typedef _W64 unsigned int uintptr_t;
     120#endif // _WIN64 ]
     121
     122// 7.18.1.5 Greatest-width integer types
     123typedef int64_t   intmax_t;
     124typedef uint64_t  uintmax_t;
     125
     126
     127// 7.18.2 Limits of specified-width integer types
     128
     129#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
     130
     131// 7.18.2.1 Limits of exact-width integer types
     132#define INT8_MIN     ((int8_t)_I8_MIN)
     133#define INT8_MAX     _I8_MAX
     134#define INT16_MIN    ((int16_t)_I16_MIN)
     135#define INT16_MAX    _I16_MAX
     136#define INT32_MIN    ((int32_t)_I32_MIN)
     137#define INT32_MAX    _I32_MAX
     138#define INT64_MIN    ((int64_t)_I64_MIN)
     139#define INT64_MAX    _I64_MAX
     140#define UINT8_MAX    _UI8_MAX
     141#define UINT16_MAX   _UI16_MAX
     142#define UINT32_MAX   _UI32_MAX
     143#define UINT64_MAX   _UI64_MAX
     144
     145// 7.18.2.2 Limits of minimum-width integer types
     146#define INT_LEAST8_MIN    INT8_MIN
     147#define INT_LEAST8_MAX    INT8_MAX
     148#define INT_LEAST16_MIN   INT16_MIN
     149#define INT_LEAST16_MAX   INT16_MAX
     150#define INT_LEAST32_MIN   INT32_MIN
     151#define INT_LEAST32_MAX   INT32_MAX
     152#define INT_LEAST64_MIN   INT64_MIN
     153#define INT_LEAST64_MAX   INT64_MAX
     154#define UINT_LEAST8_MAX   UINT8_MAX
     155#define UINT_LEAST16_MAX  UINT16_MAX
     156#define UINT_LEAST32_MAX  UINT32_MAX
     157#define UINT_LEAST64_MAX  UINT64_MAX
     158
     159// 7.18.2.3 Limits of fastest minimum-width integer types
     160#define INT_FAST8_MIN    INT8_MIN
     161#define INT_FAST8_MAX    INT8_MAX
     162#define INT_FAST16_MIN   INT16_MIN
     163#define INT_FAST16_MAX   INT16_MAX
     164#define INT_FAST32_MIN   INT32_MIN
     165#define INT_FAST32_MAX   INT32_MAX
     166#define INT_FAST64_MIN   INT64_MIN
     167#define INT_FAST64_MAX   INT64_MAX
     168#define UINT_FAST8_MAX   UINT8_MAX
     169#define UINT_FAST16_MAX  UINT16_MAX
     170#define UINT_FAST32_MAX  UINT32_MAX
     171#define UINT_FAST64_MAX  UINT64_MAX
     172
     173// 7.18.2.4 Limits of integer types capable of holding object pointers
     174#ifdef _WIN64 // [
     175#  define INTPTR_MIN   INT64_MIN
     176#  define INTPTR_MAX   INT64_MAX
     177#  define UINTPTR_MAX  UINT64_MAX
     178#else // _WIN64 ][
     179#  define INTPTR_MIN   INT32_MIN
     180#  define INTPTR_MAX   INT32_MAX
     181#  define UINTPTR_MAX  UINT32_MAX
     182#endif // _WIN64 ]
     183
     184// 7.18.2.5 Limits of greatest-width integer types
     185#define INTMAX_MIN   INT64_MIN
     186#define INTMAX_MAX   INT64_MAX
     187#define UINTMAX_MAX  UINT64_MAX
     188
     189// 7.18.3 Limits of other integer types
     190
     191#ifdef _WIN64 // [
     192#  define PTRDIFF_MIN  _I64_MIN
     193#  define PTRDIFF_MAX  _I64_MAX
     194#else  // _WIN64 ][
     195#  define PTRDIFF_MIN  _I32_MIN
     196#  define PTRDIFF_MAX  _I32_MAX
     197#endif  // _WIN64 ]
     198
     199#define SIG_ATOMIC_MIN  INT_MIN
     200#define SIG_ATOMIC_MAX  INT_MAX
     201
     202#ifndef SIZE_MAX // [
     203#  ifdef _WIN64 // [
     204#     define SIZE_MAX  _UI64_MAX
     205#  else // _WIN64 ][
     206#     define SIZE_MAX  _UI32_MAX
     207#  endif // _WIN64 ]
     208#endif // SIZE_MAX ]
     209
     210// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
     211#ifndef WCHAR_MIN // [
     212#  define WCHAR_MIN  0
     213#endif  // WCHAR_MIN ]
     214#ifndef WCHAR_MAX // [
     215#  define WCHAR_MAX  _UI16_MAX
     216#endif  // WCHAR_MAX ]
     217
     218#define WINT_MIN  0
     219#define WINT_MAX  _UI16_MAX
     220
     221#endif // __STDC_LIMIT_MACROS ]
     222
     223
     224// 7.18.4 Limits of other integer types
     225
     226#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
     227
     228// 7.18.4.1 Macros for minimum-width integer constants
     229
     230#define INT8_C(val)  val##i8
     231#define INT16_C(val) val##i16
     232#define INT32_C(val) val##i32
     233#define INT64_C(val) val##i64
     234
     235#define UINT8_C(val)  val##ui8
     236#define UINT16_C(val) val##ui16
     237#define UINT32_C(val) val##ui32
     238#define UINT64_C(val) val##ui64
     239
     240// 7.18.4.2 Macros for greatest-width integer constants
     241#define INTMAX_C   INT64_C
     242#define UINTMAX_C  UINT64_C
     243
     244#endif // __STDC_CONSTANT_MACROS ]
     245
     246
     247#endif // _MSC_STDINT_H_ ]