Skip to content

Commit 20ce8ae

Browse files
committed
Update PyCXX to latest upstream stable version (5.4.0)
svn path=/trunk/matplotlib/; revision=3734
1 parent 8c4a4d2 commit 20ce8ae

11 files changed

+5621
-5026
lines changed

CXX/Config.hxx

+44
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,40 @@
1+
//-----------------------------------------------------------------------------
2+
//
3+
// Copyright (c) 1998 - 2007, The Regents of the University of California
4+
// Produced at the Lawrence Livermore National Laboratory
5+
// All rights reserved.
6+
//
7+
// This file is part of PyCXX. For details,see http://cxx.sourceforge.net/. The
8+
// full copyright notice is contained in the file COPYRIGHT located at the root
9+
// of the PyCXX distribution.
10+
//
11+
// Redistribution and use in source and binary forms, with or without
12+
// modification, are permitted provided that the following conditions are met:
13+
//
14+
// - Redistributions of source code must retain the above copyright notice,
15+
// this list of conditions and the disclaimer below.
16+
// - Redistributions in binary form must reproduce the above copyright notice,
17+
// this list of conditions and the disclaimer (as noted below) in the
18+
// documentation and/or materials provided with the distribution.
19+
// - Neither the name of the UC/LLNL nor the names of its contributors may be
20+
// used to endorse or promote products derived from this software without
21+
// specific prior written permission.
22+
//
23+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
24+
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
25+
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
26+
// ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OF THE UNIVERSITY OF
27+
// CALIFORNIA, THE U.S. DEPARTMENT OF ENERGY OR CONTRIBUTORS BE LIABLE FOR
28+
// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
29+
// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
30+
// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
31+
// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
32+
// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33+
// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
34+
// DAMAGE.
35+
//
36+
//-----------------------------------------------------------------------------
37+
138
#ifndef __PyCXX_config_hh__
239
#define __PyCXX_config_hh__
340

@@ -70,5 +107,12 @@
70107
# define TEMPLATE_TYPENAME class
71108
#endif
72109

110+
// before 2.5 Py_ssize_t was missing
111+
#ifndef PY_MAJOR_VERSION
112+
#error not defined PY_MAJOR_VERSION
113+
#endif
114+
#if PY_MAJOR_VERSION < 2 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 5)
115+
typedef int Py_ssize_t;
116+
#endif
73117

74118
#endif // __PyCXX_config_hh__

0 commit comments

Comments
 (0)