lang/python26/patches/patch-Mac_Modules_fm___Fmmodule.c

   1 $NetBSD$
   2
   3 Fix build errors on Mac OS XLion.
   4
   5 --- Mac/Modules/fm/_Fmmodule.c.orig     2010-05-09 15:15:40.000000000 +0000
   6 +++ Mac/Modules/fm/_Fmmodule.c
   7 @@ -3,8 +3,14 @@
   8
   9  #include "Python.h"
  10
  11 -#ifndef __LP64__
  12 +#include <AvailabilityMacros.h>
  13 +#if (__MAC_OS_X_VERSION_MAX_ALLOWED >= 1070) || defined(__LP64__)
  14 +#undef HAVE_CARBON
  15 +#else
  16 +#define HAVE_CARBON
  17 +#endif
  18
  19 +#ifdef HAVE_CARBON
  20
  21  #include "pymactoolbox.h"
  22
  23 @@ -336,32 +342,32 @@ static PyMethodDef Fm_methods[] = {
  24      {NULL, NULL, 0}
  25  };
  26
  27 -#else  /* __LP64__ */
  28 +#else  /* HAVE_CARBON */
  29
  30  static PyMethodDef Fm_methods[] = {
  31      {NULL, NULL, 0}
  32  };
  33
  34 -#endif  /* __LP64__ */
  35 +#endif  /* HAVE_CARBON */
  36
  37  void init_Fm(void)
  38  {
  39      PyObject *m;
  40 -#ifndef __LP64__
  41 +#ifdef HAVE_CARBON
  42      PyObject *d;
  43 -#endif  /* __LP64__ */
  44 +#endif  /* HAVE_CARBON */
  45
  46
  47
  48
  49      m = Py_InitModule("_Fm", Fm_methods);
  50 -#ifndef __LP64__
  51 +#ifdef HAVE_CARBON
  52      d = PyModule_GetDict(m);
  53      Fm_Error = PyMac_GetOSErrException();
  54      if (Fm_Error == NULL ||
  55          PyDict_SetItemString(d, "Error", Fm_Error) != 0)
  56          return;
  57 -#endif  /* __LP64__ */
  58 +#endif  /* HAVE_CARBON */
  59  }
  60
  61  /* ========================= End module _Fm ========================= */