diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-09-29 12:55:00 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-09-29 12:55:00 +0300 |
| commit | e3fe8128e41bb7c576f02ba234dfabf5c399cb60 (patch) | |
| tree | cd148a38fb32cdb1a36fc576b9f36fe864003e40 /source/gameengine | |
| parent | 31be6fccf83095f4245f97730ccc7e61e51cfcec (diff) | |
| parent | 5a1954a5cbd7b0b1458fdc80ada5acd036278309 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Ketsji/KX_PythonInit.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 97a7e161e9f..5540aad7a3f 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -40,11 +40,6 @@ # ifdef _XOPEN_SOURCE # undef _XOPEN_SOURCE # endif -# if defined(__sun) || defined(sun) -# if defined(_XPG4) -# undef _XPG4 -# endif -# endif # include <Python.h> extern "C" { |