[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22334] branches/blender2.5/blender: fix for build problem with audiospace and implicit declaration.

[Campbell Barton]

Revision: 22334
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22334
Author:   campbellbarton
Date:     2009-08-10 06:50:48 +0200 (Mon, 10 Aug 2009)

Log Message:
-----------
fix for build problem with audiospace and implicit declaration.

Modified Paths:
--------------
    branches/blender2.5/blender/intern/audaspace/AUD_C-API.h
    branches/blender2.5/blender/source/blender/python/intern/bpy_util.c
    branches/blender2.5/blender/source/blender/python/intern/bpy_util.h

Modified: branches/blender2.5/blender/intern/audaspace/AUD_C-API.h
===================================================================
--- branches/blender2.5/blender/intern/audaspace/AUD_C-API.h	2009-08-10 02:43:03 UTC (rev 22333)
+++ branches/blender2.5/blender/intern/audaspace/AUD_C-API.h	2009-08-10 04:50:48 UTC (rev 22334)
@@ -30,7 +30,7 @@
 extern "C" {
 #endif
 
-#include "AUD_Space.h"
+#include "./intern/AUD_Space.h"
 
 typedef enum
 {

Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_util.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_util.c	2009-08-10 02:43:03 UTC (rev 22333)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_util.c	2009-08-10 04:50:48 UTC (rev 22334)
@@ -124,7 +124,6 @@
 
 
 /* Copied from pythons 3's Object.c */
-#ifndef Py_CmpToRich
 PyObject *
 Py_CmpToRich(int op, int cmp)
 {
@@ -160,7 +159,6 @@
 	Py_INCREF(res);
 	return res;
 }
-#endif
 
 /* for debugging */
 void PyObSpit(char *name, PyObject *var) {

Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_util.h
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_util.h	2009-08-10 02:43:03 UTC (rev 22333)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_util.h	2009-08-10 04:50:48 UTC (rev 22334)
@@ -50,6 +50,8 @@
 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 @@
 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);