fix for build problem with audiospace and implicit declaration.
authorCampbell Barton <ideasman42@gmail.com>
Mon, 10 Aug 2009 04:50:48 +0000 (04:50 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 10 Aug 2009 04:50:48 +0000 (04:50 +0000)
intern/audaspace/AUD_C-API.h
source/blender/python/intern/bpy_util.c
source/blender/python/intern/bpy_util.h

index b08f05db1ca579896e328040b9fd7f53cd245ba8..1c3a4b94624f068a154bdc90bb9279b501b3f108 100644 (file)
@@ -30,7 +30,7 @@
 extern "C" {
 #endif
 
-#include "AUD_Space.h"
+#include "./intern/AUD_Space.h"
 
 typedef enum
 {
index 25967d96dabe8b2eb8a76341a113ed2d43be8ace..1e73e357526245665730a000e04c637e09f9a098 100644 (file)
@@ -124,7 +124,6 @@ int BPY_flag_from_seq(BPY_flag_def *flagdef, PyObject *seq, int *flag)
 
 
 /* Copied from pythons 3's Object.c */
-#ifndef Py_CmpToRich
 PyObject *
 Py_CmpToRich(int op, int cmp)
 {
@@ -160,7 +159,6 @@ Py_CmpToRich(int op, int cmp)
        Py_INCREF(res);
        return res;
 }
-#endif
 
 /* for debugging */
 void PyObSpit(char *name, PyObject *var) {
index 3a47691e79f9fa3b4486c4b2248f4e4e667111d9..0400d595520c0b51573eae72ef49bdc838aa9036 100644 (file)
@@ -50,6 +50,8 @@ void PyObSpit(char *name, PyObject *var);
 void PyLineSpit(void);
 void BPY_getFileAndNum(char **filename, int *lineno);
 
+PyObject *Py_CmpToRich(int op, int cmp);
+
 PyObject *BPY_exception_buffer(void);
 
 /* own python like utility function */
@@ -75,7 +77,7 @@ int BPY_class_validate(const char *class_type, PyObject *class, PyObject *base_c
 char *BPy_enum_as_string(struct EnumPropertyItem *item);
 
 
-#define BLANK_PYTHON_TYPE {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}
+#define BLANK_PYTHON_TYPE {PyVarObject_HEAD_INIT(NULL, 0) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}
 
 /* error reporting */
 int BPy_reports_to_error(struct ReportList *reports);