8000 Fix Mac compile again · matplotlib/matplotlib@6cbe37c · GitHub
[go: up one dir, main page]
Skip to content

Commit 6cbe37c

Browse files
mdboommdboom
committed
Fix Mac compile again
1 parent 139a0e4 commit 6cbe37c

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

‎src/_path_wrapper.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#include "numpy_cpp.h"
2+
13
#include "_path.h"
24

35
#include "py_converters.h"

‎src/_png.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212

1313
#include <vector>
1414

15+
#include "numpy_cpp.h"
16+
#include "mplutils.h"
17+
#include "file_compat.h"
18+
19+
extern "C" {
1520
#ifdef __linux__
1621
# include <png.h>
1722
# ifdef _POSIX_C_SOURCE
@@ -28,10 +33,8 @@
2833

2934
# include <png.h>
3035
#endif
36+
}
3137

32-
#include "file_compat.h"
33-
#include "numpy_cpp.h"
34-
#include "mplutils.h"
3538

3639
// As reported in [3082058] build _png.so on aix
3740
#ifdef _AIX

‎src/mplutils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifndef _MPLUTILS_H
66
#define _MPLUTILS_H
77

8-
#ifdef _MSC_VER && _MSC_VER <= 1600
8+
#if defined(_MSC_VER) && _MSC_VER <= 1600
99
typedef unsigned __int8 uint8_t;
1010
#else
1111
#include <stdint.h>

0 commit comments

Comments
 (0)
0