diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-07-25 13:29:46 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-07-25 13:30:24 +0300 |
| commit | a4db868092378b54b95c7a523d4fb841173869e7 (patch) | |
| tree | 3099ee3f256400e6451e477627082a2f29ddf6f4 /extern/curve_fit_nd | |
| parent | bbf62931deed04eba4ec7b6589139637d74df70e (diff) | |
Resolve build error on OSX
Diffstat (limited to 'extern/curve_fit_nd')
| -rw-r--r-- | extern/curve_fit_nd/intern/curve_fit_cubic_refit.c | 6 | ||||
| -rw-r--r-- | extern/curve_fit_nd/intern/generic_heap.h | 4 |
2 files changed, 3 insertions, 7 deletions
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 c701f28f131..46445467869 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 74327c761e4..e39344cf076 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 |