FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fixes for clang · matplotlib/matplotlib@3147d8d · GitHub

  1. matplotlib
  2. matplotlib

Repository navigation

Commit 3147d8d

Browse files
mdboom
committed
Fixes for clang
1 parent 7ac0f2b commit 3147d8d

10 files changed

Lines changed: 22 additions & 20 deletions

‎extern/ttconv/pprdrv_tt.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@
3131
#include "pprdrv.h"
3232
#include "truetype.h"
3333
#include <sstream>
34+
#ifdef _POSIX_C_SOURCE
35+
# undef _POSIX_C_SOURCE
36+
#endif
37+
#ifdef _XOPEN_SOURCE
38+
# undef _XOPEN_SOURCE
39+
#endif
3440
#include <Python.h>
3541

3642
/*==========================================================================

‎src/_backend_agg_wrapper.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -670,10 +670,7 @@ extern "C" {
670670

671671
struct module_state
672672
{
673-
/* The Sun compiler can't handle empty structs */
674-
#if defined(__SUNPRO_C) || defined(_MSC_VER)
675673
int _dummy;
676-
#endif
677674
};
678675

679676
#if PY3K

‎src/_gtkagg.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,7 @@ extern "C" {
110110

111111
struct module_state
112112
{
113-
/* The Sun compiler can't handle empty structs */
114-
#if defined(__SUNPRO_C) || defined(_MSC_VER)
115113
int _dummy;
116-
#endif
117114
};
118115

119116
#if PY3K

‎src/_image_wrapper.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -722,10 +722,7 @@ extern "C" {
722722

723723
struct module_state
724724
{
725-
/* The Sun compiler can't handle empty structs */
726-
#if defined(__SUNPRO_C) || defined(_MSC_VER)
727725
int _dummy;
728-
#endif
729726
};
730727

731728
#if PY3K

‎src/_path_wrapper.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -669,10 +669,7 @@ extern "C" {
669669

670670
struct module_state
671671
{
672-
/* The Sun compiler can't handle empty structs */
673-
#if defined(__SUNPRO_C) || defined(_MSC_VER)
674672
int _dummy;
675-
#endif
676673
};
677674

678675
#if PY3K

‎src/_png.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -490,10 +490,7 @@ extern "C" {
490490

491491
struct module_state
492492
{
493-
/* The Sun compiler can't handle empty structs */
494-
#if defined(__SUNPRO_C) || defined(_MSC_VER)
495493
int _dummy;
496-
#endif
497494
};
498495

499496
#if PY3K

‎src/ft2font_wrapper.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1618,10 +1618,7 @@ extern "C" {
16181618

16191619
struct module_state
16201620
{
1621-
/* The Sun compiler can't handle empty structs */
1622-
#if defined(__SUNPRO_C) || defined(_MSC_VER)
16231621
int _dummy;
1624-
#endif
16251622
};
16261623

16271624
#if PY3K

‎src/mplutils.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@ typedef unsigned __int8 uint8_t;
1111
#include <stdint.h>
1212
#endif
1313

14+
#ifdef _POSIX_C_SOURCE
15+
# undef _POSIX_C_SOURCE
16+
#endif
17+
#ifdef _XOPEN_SOURCE
18+
# undef _XOPEN_SOURCE
19+
#endif
20+
1421
#include <Python.h>
1522

1623
#if PY_MAJOR_VERSION >= 3

‎src/numpy_cpp.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@
1818

1919
#include <complex>
2020

21+
#ifdef _POSIX_C_SOURCE
22+
# undef _POSIX_C_SOURCE
23+
#endif
24+
#ifdef _XOPEN_SOURCE
25+
# undef _XOPEN_SOURCE
26+
#endif
27+
2128
#include <Python.h>
2229
#include <numpy/ndarrayobject.h>
2330

‎src/py_converters.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -493,13 +493,13 @@ int convert_offset_position(PyObject *obj, void *offsetp)
493493
e_offset_position *offset = (e_offset_position *)offsetp;
494494
const char *names[] = {"data", NULL};
495495
int values[] = {OFFSET_POSITION_DATA};
496-
int result = OFFSET_POSITION_FIGURE;
496+
int result = (int)OFFSET_POSITION_FIGURE;
497497

498498
if (!convert_string_enum(obj, "offset_position", names, values, &result)) {
499499
PyErr_Clear();
500500
}
501501

502-
*offset = result;
502+
*offset = (e_offset_position)result;
503503

504504
return 1;
505505
}

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL