haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warning: 'HAVE_CLOCK_GETTIME' macro redefined

This commit is contained in:
Thomas Pointhuber 2018-08-05 12:28:10 +02:00 committed by Maciej Suminski
parent 7365cb8e52
commit 22e5e52598
5 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcbnew/dialogs/dialog_scripting.cpp
View File

@ -28,6 +28,8 @@
#include <Python.h> #include <Python.h>
#undef HAVE_CLOCK_GETTIME // macro is defined in Python.h and causes redefine warning
#include <fctsys.h> #include <fctsys.h>
#include <pcbnew.h> #include <pcbnew.h>
#include <pcb_edit_frame.h> #include <pcb_edit_frame.h>

4
pcbnew/swig/pcbnew_action_plugins.h
View File

@ -28,7 +28,11 @@
#ifndef PCBNEW_ACTION_PLUGINS_H #ifndef PCBNEW_ACTION_PLUGINS_H
#define PCBNEW_ACTION_PLUGINS_H #define PCBNEW_ACTION_PLUGINS_H
#undef HAVE_CLOCK_GETTIME // macro is defined in Python.h and causes redefine warning
#include <Python.h> #include <Python.h>
#undef HAVE_CLOCK_GETTIME
#include <vector> #include <vector>
#include <action_plugin.h> #include <action_plugin.h>

4
pcbnew/swig/pcbnew_footprint_wizards.h
View File

@ -29,7 +29,11 @@
#ifndef PCBNEW_FOOTPRINT_WIZARDS_H #ifndef PCBNEW_FOOTPRINT_WIZARDS_H
#define PCBNEW_FOOTPRINT_WIZARDS_H #define PCBNEW_FOOTPRINT_WIZARDS_H
#undef HAVE_CLOCK_GETTIME // macro is defined in Python.h and causes redefine warning
#include <Python.h> #include <Python.h>
#undef HAVE_CLOCK_GETTIME
#include <vector> #include <vector>
#include <footprint_wizard.h> #include <footprint_wizard.h>

1
pcbnew/swig/pcbnew_scripting_helpers.cpp
View File

@ -28,6 +28,7 @@
*/ */
#include <Python.h> #include <Python.h>
#undef HAVE_CLOCK_GETTIME // macro is defined in Python.h and causes redefine warning
#include <pcbnew_scripting_helpers.h> #include <pcbnew_scripting_helpers.h>
#include <pcbnew.h> #include <pcbnew.h>

3
pcbnew/swig/python_scripting.h
View File

@ -33,7 +33,10 @@
#undef _XOPEN_SOURCE #undef _XOPEN_SOURCE
#endif #endif
#undef HAVE_CLOCK_GETTIME // macro is defined in Python.h and causes redefine warning
#include <Python.h> #include <Python.h>
#undef HAVE_CLOCK_GETTIME
#ifndef NO_WXPYTHON_EXTENSION_HEADERS #ifndef NO_WXPYTHON_EXTENSION_HEADERS
#ifdef KICAD_SCRIPTING_WXPYTHON #ifdef KICAD_SCRIPTING_WXPYTHON
#include <wx/wxPython/wxPython.h> #include <wx/wxPython/wxPython.h>