Skip to content

Commit d0a93f0

Browse files
committed
Revert "Move C headers in extern C context."
This reverts commit e901a56. This doesn't silence the warnings in clang.
1 parent 55cf724 commit d0a93f0

File tree

7 files changed

+7
-17
lines changed

7 files changed

+7
-17
lines changed

graf2d/asimage/src/TASImage.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ ROOT tutorials: `$ROOTSYS/tutorials/image/`
104104
# include <win32/afterbase.h>
105105
# define X_DISPLAY_MISSING 1
106106
#endif
107-
extern "C" {
108107
# include <afterimage.h>
109108
# include <bmp.h>
109+
extern "C" {
110110
# include <draw.h>
111111
}
112112

graf2d/asimage/src/TASPaletteEditor.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ It is called by a pull down menu item of TASImage.
4646
# include <win32/config.h>
4747
# include <win32/afterbase.h>
4848
#endif
49-
extern "C" {
5049
# include <afterimage.h>
50+
extern "C" {
5151
# include <bmp.h>
5252
}
5353

tmva/pymva/src/MethodPyAdaBoost.cxx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
* *
1818
**********************************************************************************/
1919

20-
extern "C" {
21-
#include <Python.h> // Needs to be included first to avoid redefinition of _POSIX_C_SOURCE
22-
}
20+
#include <Python.h> // Needs to be included first to avoid redefinition of _POSIX_C_SOURCE
2321
#include "TMVA/MethodPyAdaBoost.h"
2422

2523
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION

tmva/pymva/src/MethodPyGTB.cxx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
* *
1818
**********************************************************************************/
1919

20-
extern "C" {
21-
#include <Python.h> // Needs to be included first to avoid redefinition of _POSIX_C_SOURCE
22-
}
20+
#include <Python.h> // Needs to be included first to avoid redefinition of _POSIX_C_SOURCE
2321
#include "TMVA/MethodPyGTB.h"
2422

2523
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION

tmva/pymva/src/MethodPyKeras.cxx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
// @(#)root/tmva/pymva $Id$
22
// Author: Stefan Wunsch, 2016
33

4-
extern "C" {
5-
#include <Python.h>
6-
}
4+
#include <Python.h>
75
#include "TMVA/MethodPyKeras.h"
86

97
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION

tmva/pymva/src/MethodPyRandomForest.cxx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
* (http://tmva.sourceforge.net/LICENSE) *
1717
* *
1818
**********************************************************************************/
19-
extern "C" {
20-
#include <Python.h> // Needs to be included first to avoid redefinition of _POSIX_C_SOURCE
21-
}
19+
#include <Python.h> // Needs to be included first to avoid redefinition of _POSIX_C_SOURCE
2220
#include "TMVA/MethodPyRandomForest.h"
2321

2422
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION

tmva/pymva/src/PyMethodBase.cxx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
* *
1212
**********************************************************************************/
1313

14-
extern "C" {
15-
#include <Python.h> // Needs to be included first to avoid redefinition of _POSIX_C_SOURCE
16-
}
14+
#include <Python.h> // Needs to be included first to avoid redefinition of _POSIX_C_SOURCE
1715
#include <TMVA/PyMethodBase.h>
1816

1917
#include "TMVA/DataSet.h"

0 commit comments

Comments
 (0)