Commit: a4db868092378b54b95c7a523d4fb841173869e7
Author: Campbell Barton
Date: Mon Jul 25 20:29:46 2016 +1000
Branches: master
https://developer.blender.org/rBa4db868092378b54b95c7a523d4fb841173869e7
Resolve build error on OSX
===================================================================
M extern/curve_fit_nd/intern/curve_fit_cubic_refit.c
M extern/curve_fit_nd/intern/generic_heap.h
===================================================================
diff --git a/extern/curve_fit_nd/intern/curve_fit_cubic_refit.c
b/extern/curve_fit_nd/intern/curve_fit_cubic_refit.c
index c701f28..4644546 100644
--- a/extern/curve_fit_nd/intern/curve_fit_cubic_refit.c
+++ b/extern/curve_fit_nd/intern/curve_fit_cubic_refit.c
@@ -51,8 +51,7 @@
#include <string.h>
#include <stdlib.h>
-
-#include <stdio.h>
+typedef unsigned int uint;
#include "curve_fit_inline.h"
#include "../curve_fit_nd.h"
@@ -101,9 +100,6 @@
# define UNLIKELY(x) (x)
#endif
-
-typedef unsigned int uint;
-
struct PointData {
const double *points;
uint points_len;
diff --git a/extern/curve_fit_nd/intern/generic_heap.h
b/extern/curve_fit_nd/intern/generic_heap.h
index 74327c7..e39344c 100644
--- a/extern/curve_fit_nd/intern/generic_heap.h
+++ b/extern/curve_fit_nd/intern/generic_heap.h
@@ -24,8 +24,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __GENERIC_HEAP_IMPL_H__
-#define __GENERIC_HEAP_IMPL_H__
+#ifndef __GENERIC_HEAP_H__
+#define __GENERIC_HEAP_H__
/** \file generic_heap.h
* \ingroup curve_fit
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
