← Back to branch summary

~jtaylor/ubuntu/precise/python-numpy/multiarch-fix-818867

« back to all changes in this revision

Viewing changes to numpy/core/include/numpy/numpyconfig.h

  • Committer: Bazaar Package Importer
  • Author(s): Sandro Tosi
  • Date: 2010-10-07 10:19:13 UTC
  • mfrom: (7.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20101007101913-8b1kmt8ho4upcl9s
Tags: 1:1.4.1-5
http://bugs.debian.org/581058
* debian/patches/10_use_local_python.org_object.inv_sphinx.diff
  - fixed small typo in description
* debian/patches/changeset_r8364.diff
  - fix memory corruption (double free); thanks to Joseph Barillari for the
    report and to Michael Gilbert for pushing resolution; Closes: #581058

Show diffs side-by-side

added added

removed removed

Lines of Context:
numpy/core/include/numpy/numpyconfig.h
 
1
#ifndef _NPY_NUMPYCONFIG_H_
 
2
#define _NPY_NUMPYCONFIG_H_
 
3
 
 
4
#include "_numpyconfig.h"
 
5
 
 
6
/* 
 
7
 * On Mac OS X, because there is only one configuration stage for all the archs
 
8
 * in universal builds, any macro which depends on the arch needs to be
 
9
 * harcoded
 
10
 */
 
11
#ifdef __APPLE__
 
12
        #undef NPY_SIZEOF_LONG
 
13
        #undef NPY_SIZEOF_PY_INTPTR_T
 
14
 
 
15
        #ifdef __LP64__
 
16
                #define NPY_SIZEOF_LONG                 8
 
17
                #define NPY_SIZEOF_PY_INTPTR_T  8
 
18
        #else
 
19
                #define NPY_SIZEOF_LONG                 4
 
20
                #define NPY_SIZEOF_PY_INTPTR_T  4
 
21
        #endif
 
22
#endif
 
23
 
 
24
#endif