diff --git a/Makefile.in b/Makefile.in index dc96fef41f..8028c97728 100644 --- a/Makefile.in +++ b/Makefile.in @@ -707,7 +707,6 @@ ALL_PORTS_BASE_HEADERS = \ wx/unix/stackwalk.h \ wx/unix/tls.h \ wx/unix/fswatcher_kqueue.h \ - wx/unix/execute.h \ wx/unix/mimetype.h \ wx/unix/fswatcher_inotify.h \ wx/msw/apptrait.h \ @@ -2471,7 +2470,6 @@ COND_TOOLKIT_COCOA_BASE_OSX_HDR = \ wx/unix/stackwalk.h \ wx/unix/tls.h \ wx/unix/fswatcher_kqueue.h \ - wx/unix/execute.h \ wx/unix/mimetype.h \ wx/osx/core/cfdataref.h \ wx/osx/core/cfref.h \ @@ -2494,7 +2492,6 @@ COND_TOOLKIT_GTK_BASE_OSX_HDR = \ wx/unix/stackwalk.h \ wx/unix/tls.h \ wx/unix/fswatcher_kqueue.h \ - wx/unix/execute.h \ wx/unix/mimetype.h \ wx/osx/core/cfdataref.h \ wx/osx/core/cfref.h \ @@ -2517,7 +2514,6 @@ COND_TOOLKIT_X11_BASE_OSX_HDR = \ wx/unix/stackwalk.h \ wx/unix/tls.h \ wx/unix/fswatcher_kqueue.h \ - wx/unix/execute.h \ wx/unix/mimetype.h \ wx/osx/core/cfdataref.h \ wx/osx/core/cfref.h \ @@ -2540,7 +2536,6 @@ COND_TOOLKIT_MOTIF_BASE_OSX_HDR = \ wx/unix/stackwalk.h \ wx/unix/tls.h \ wx/unix/fswatcher_kqueue.h \ - wx/unix/execute.h \ wx/unix/mimetype.h \ wx/osx/core/cfdataref.h \ wx/osx/core/cfref.h \ @@ -2563,7 +2558,6 @@ COND_TOOLKIT__BASE_OSX_HDR = \ wx/unix/stackwalk.h \ wx/unix/tls.h \ wx/unix/fswatcher_kqueue.h \ - wx/unix/execute.h \ wx/unix/mimetype.h \ wx/osx/core/cfdataref.h \ wx/osx/core/cfref.h \ @@ -2588,7 +2582,6 @@ COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR = \ wx/unix/stackwalk.h \ wx/unix/tls.h \ wx/unix/fswatcher_kqueue.h \ - wx/unix/execute.h \ wx/unix/mimetype.h \ wx/unix/fswatcher_inotify.h @COND_PLATFORM_UNIX_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR) diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 53a95499e9..69366c5e2a 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -102,7 +102,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(BASE_UNIX_AND_DARWIN_HDR) - wx/unix/execute.h wx/unix/mimetype.h diff --git a/include/wx/unix/execute.h b/include/wx/unix/private/execute.h similarity index 98% rename from include/wx/unix/execute.h rename to include/wx/unix/private/execute.h index 9756c00a7d..e976d154c7 100644 --- a/include/wx/unix/execute.h +++ b/include/wx/unix/private/execute.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/execute.h +// Name: wx/unix/private/execute.h // Purpose: private details of wxExecute() implementation // Author: Vadim Zeitlin // Copyright: (c) 1998 Robert Roebling, Julian Smart, Vadim Zeitlin diff --git a/src/unix/apptraits.cpp b/src/unix/apptraits.cpp index d29f9acdbb..ba2c94629e 100644 --- a/src/unix/apptraits.cpp +++ b/src/unix/apptraits.cpp @@ -28,7 +28,7 @@ #include "wx/utils.h" #endif // WX_PRECOMP -#include "wx/unix/execute.h" +#include "wx/unix/private/execute.h" #include "wx/evtloop.h" // ============================================================================ diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index 50fe929c31..97a6c47190 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -46,7 +46,7 @@ #include "wx/private/selectdispatcher.h" #include "wx/private/fdiodispatcher.h" -#include "wx/unix/execute.h" +#include "wx/unix/private/execute.h" #include "wx/unix/pipe.h" #include "wx/unix/private.h"