diff options
| -rw-r--r-- | desktop/source/app/app.cxx | 2 | ||||
| -rw-r--r-- | desktop/unx/source/start.c | 2 | ||||
| -rw-r--r-- | desktop/win32/source/officeloader/officeloader.cxx | 2 | ||||
| -rw-r--r-- | include/desktop/exithelper.h (renamed from desktop/source/inc/exithelper.h) | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 38101efaf6b1..05c3f9b6d9f5 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -35,7 +35,6 @@ #include "lockfile.hxx" #include "userinstall.hxx" #include "desktopcontext.hxx" -#include "exithelper.h" #include "migration.hxx" #include <svl/languageoptions.hxx> @@ -76,6 +75,7 @@ #include <com/sun/star/frame/thePopupMenuControllerFactory.hpp> #include <com/sun/star/office/Quickstart.hpp> +#include <desktop/exithelper.h> #include <sal/log.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/configuration.hxx> diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c index 893c79c4e0b7..b56477dfd39c 100644 --- a/desktop/unx/source/start.c +++ b/desktop/unx/source/start.c @@ -25,6 +25,7 @@ #include <string.h> #include <errno.h> +#include <desktop/exithelper.h> #include <osl/process.h> #include <osl/thread.h> #include <rtl/bootstrap.h> @@ -34,7 +35,6 @@ #include <sal/main.h> #include "args.h" -#include "../../source/inc/exithelper.h" #include "pagein.h" #include "splashx.h" diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx index 3f9760f9344f..ea442bd48de8 100644 --- a/desktop/win32/source/officeloader/officeloader.cxx +++ b/desktop/win32/source/officeloader/officeloader.cxx @@ -38,10 +38,10 @@ #include <stdlib.h> #include <systools/win32/uwinapi.h> +#include <desktop/exithelper.h> #include <rtl/string.h> #include <sal/macros.h> -#include "../../../source/inc/exithelper.h" #include "../loader.hxx" #include <config_version.h> diff --git a/desktop/source/inc/exithelper.h b/include/desktop/exithelper.h index b29af5b8f8d0..d6e337ce0f2a 100644 --- a/desktop/source/inc/exithelper.h +++ b/include/desktop/exithelper.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_INC_EXITHELPER_H -#define INCLUDED_DESKTOP_SOURCE_INC_EXITHELPER_H +#ifndef INCLUDED_DESKTOP_EXITHELPER_H +#define INCLUDED_DESKTOP_EXITHELPER_H enum EExitCodes { /* e.g. used to force showing of the command line help */ @@ -33,6 +33,6 @@ enum EExitCodes { EXITHELPER_NORMAL_RESTART = 81 }; -#endif // INCLUDED_DESKTOP_SOURCE_INC_EXITHELPER_H +#endif // INCLUDED_DESKTOP_EXITHELPER_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |