summaryrefslogtreecommitdiffstats
path: root/vcl/inc/unx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/inc/unx')
-rw-r--r--vcl/inc/unx/desktops.hxx6
-rw-r--r--vcl/inc/unx/gtk/atkbridge.hxx4
-rw-r--r--vcl/inc/unx/gtk/gloactiongroup.h6
-rw-r--r--vcl/inc/unx/gtk/glomenu.h6
-rw-r--r--vcl/inc/unx/gtk/gtkdata.hxx6
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx6
-rw-r--r--vcl/inc/unx/gtk/gtkgdi.hxx6
-rw-r--r--vcl/inc/unx/gtk/gtkinst.hxx6
-rw-r--r--vcl/inc/unx/gtk/gtkobject.hxx4
-rw-r--r--vcl/inc/unx/gtk/gtkprn.hxx6
-rw-r--r--vcl/inc/unx/gtk/gtksalmenu.hxx6
-rw-r--r--vcl/inc/unx/gtk/gtksys.hxx6
-rw-r--r--vcl/inc/unx/i18n_cb.hxx6
-rw-r--r--vcl/inc/unx/i18n_ic.hxx6
-rw-r--r--vcl/inc/unx/i18n_im.hxx6
-rw-r--r--vcl/inc/unx/i18n_keysym.hxx6
-rw-r--r--vcl/inc/unx/i18n_status.hxx6
-rw-r--r--vcl/inc/unx/i18n_xkb.hxx6
-rw-r--r--vcl/inc/unx/kde/kdedata.hxx6
-rw-r--r--vcl/inc/unx/saltype.h6
-rw-r--r--vcl/inc/unx/salunx.h4
-rw-r--r--vcl/inc/unx/salunxtime.h6
-rw-r--r--vcl/inc/unx/sm.hxx4
-rw-r--r--vcl/inc/unx/wmadaptor.hxx4
-rw-r--r--vcl/inc/unx/x11/x11sys.hxx6
25 files changed, 70 insertions, 70 deletions
diff --git a/vcl/inc/unx/desktops.hxx b/vcl/inc/unx/desktops.hxx
index e41add4b588e..f67e8ca9a8ba 100644
--- a/vcl/inc/unx/desktops.hxx
+++ b/vcl/inc/unx/desktops.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_DESKTOPS_HXX
-#define INCLUDED_VCL_DESKTOPS_HXX
+#ifndef INCLUDED_VCL_INC_UNX_DESKTOPS_HXX
+#define INCLUDED_VCL_INC_UNX_DESKTOPS_HXX
enum DesktopType {
DESKTOP_NONE, // headless, i.e. no X connection at all
@@ -31,6 +31,6 @@ enum DesktopType {
DESKTOP_TDE
}; // keep in sync with desktop_strings[] in salplug.cxx
-#endif // INCLUDED_VCL_DESKTOPS_HXX
+#endif // INCLUDED_VCL_INC_UNX_DESKTOPS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/atkbridge.hxx b/vcl/inc/unx/gtk/atkbridge.hxx
index 36b9b4a27f6e..480ce917fc5e 100644
--- a/vcl/inc/unx/gtk/atkbridge.hxx
+++ b/vcl/inc/unx/gtk/atkbridge.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __ATK_BRIDGE_HXX__
-#define __ATK_BRIDGE_HXX__
+#ifndef INCLUDED_VCL_INC_UNX_GTK_ATKBRIDGE_HXX
+#define INCLUDED_VCL_INC_UNX_GTK_ATKBRIDGE_HXX
#include <vclpluginapi.h>
diff --git a/vcl/inc/unx/gtk/gloactiongroup.h b/vcl/inc/unx/gtk/gloactiongroup.h
index fb05d436094f..ea005aef3935 100644
--- a/vcl/inc/unx/gtk/gloactiongroup.h
+++ b/vcl/inc/unx/gtk/gloactiongroup.h
@@ -8,8 +8,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef GLOACTIONGROUP_H
-#define GLOACTIONGROUP_H
+#ifndef INCLUDED_VCL_INC_UNX_GTK_GLOACTIONGROUP_H
+#define INCLUDED_VCL_INC_UNX_GTK_GLOACTIONGROUP_H
#include <gio/gio.h>
@@ -77,6 +77,6 @@ void g_lo_action_group_clear (GLOActionGroup
G_END_DECLS
-#endif // GLOACTIONGROUP_H
+#endif // INCLUDED_VCL_INC_UNX_GTK_GLOACTIONGROUP_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/glomenu.h b/vcl/inc/unx/gtk/glomenu.h
index f74af4b4c050..197752f86b9c 100644
--- a/vcl/inc/unx/gtk/glomenu.h
+++ b/vcl/inc/unx/gtk/glomenu.h
@@ -8,8 +8,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef __G_LO_MENU_H__
-#define __G_LO_MENU_H__
+#ifndef INCLUDED_VCL_INC_UNX_GTK_GLOMENU_H
+#define INCLUDED_VCL_INC_UNX_GTK_GLOMENU_H
#include <gio/gio.h>
@@ -130,6 +130,6 @@ GLOMenu * g_lo_menu_get_menu_containing_item (GLOMenu
G_END_DECLS
-#endif /* __G_LO_MENU_H__ */
+#endif // INCLUDED_VCL_INC_UNX_GTK_GLOMENU_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 702c76463ad1..c1259050373d 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_GTKDATA_HXX
-#define _VCL_GTKDATA_HXX
+#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKDATA_HXX
+#define INCLUDED_VCL_INC_UNX_GTK_GTKDATA_HXX
#include <prex.h>
#define GLIB_DISABLE_DEPRECATION_WARNINGS
@@ -187,6 +187,6 @@ inline GdkDisplay *GtkData::GetGdkDisplay()
#if !GTK_CHECK_VERSION(3,0,0)
#endif
-#endif // _VCL_GTKDATA_HXX
+#endif // INCLUDED_VCL_INC_UNX_GTK_GTKDATA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 4d4eaa6cf747..0cf197a7d70d 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_GTKFRAME_HXX
-#define _VCL_GTKFRAME_HXX
+#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKFRAME_HXX
+#define INCLUDED_VCL_INC_UNX_GTK_GTKFRAME_HXX
#include <prex.h>
#include <cairo.h>
@@ -459,6 +459,6 @@ GType ooo_fixed_get_type( void );
} // extern "C"
-#endif //_VCL_GTKFRAME_HXX
+#endif // INCLUDED_VCL_INC_UNX_GTK_GTKFRAME_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index d75e9dc07e29..9ddd99b48c5b 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_GTKGDI_HXX
-#define _VCL_GTKGDI_HXX
+#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKGDI_HXX
+#define INCLUDED_VCL_INC_UNX_GTK_GTKGDI_HXX
#include <prex.h>
#include <gtk/gtk.h>
@@ -280,6 +280,6 @@ protected:
#endif // !gtk3
-#endif // _VCL_GTKGDI_HXX
+#endif // INCLUDED_VCL_INC_UNX_GTK_GTKGDI_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 4787b211569e..9ec7c1e6d11d 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_GTKINST_HXX
-#define _VCL_GTKINST_HXX
+#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKINST_HXX
+#define INCLUDED_VCL_INC_UNX_GTK_GTKINST_HXX
#include <boost/shared_ptr.hpp>
@@ -116,6 +116,6 @@ public:
mutable boost::shared_ptr<vcl::unx::GtkPrintWrapper> m_pPrintWrapper;
};
-#endif // _VCL_GTKINST_HXX
+#endif // INCLUDED_VCL_INC_UNX_GTK_GTKINST_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx
index 1690908f477c..d19e45d9d018 100644
--- a/vcl/inc/unx/gtk/gtkobject.hxx
+++ b/vcl/inc/unx/gtk/gtkobject.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_GTKOBJECT_HXX
-#define _VCL_GTKOBJECT_HXX
+#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKOBJECT_HXX
+#define INCLUDED_VCL_INC_UNX_GTK_GTKOBJECT_HXX
#include <tools/solar.h>
#include <vcl/sysdata.hxx>
diff --git a/vcl/inc/unx/gtk/gtkprn.hxx b/vcl/inc/unx/gtk/gtkprn.hxx
index 73ba680a6914..2550dd38052f 100644
--- a/vcl/inc/unx/gtk/gtkprn.hxx
+++ b/vcl/inc/unx/gtk/gtkprn.hxx
@@ -8,8 +8,8 @@
*/
-#ifndef UNX_GTK_GTKPRN_HXX_INCLUDED
-#define UNX_GTK_GTKPRN_HXX_INCLUDED
+#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKPRN_HXX
+#define INCLUDED_VCL_INC_UNX_GTK_GTKPRN_HXX
#include "generic/genprn.h"
@@ -48,6 +48,6 @@ public:
};
-#endif // UNX_GTK_GTKPRN_HXX_INCLUDED
+#endif // INCLUDED_VCL_INC_UNX_GTK_GTKPRN_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 89c1af044165..4b2ac33dc26f 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef GTKSALMENU_HXX
-#define GTKSALMENU_HXX
+#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX
+#define INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX
#include <vector>
#ifdef ENABLE_GIO
@@ -120,6 +120,6 @@ public:
GtkSalMenu* mpSubMenu; // Submenu of this item (if defined)
};
-#endif // GTKSALMENU_HXX
+#endif // INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx
index d787476f52bc..46c6402e357d 100644
--- a/vcl/inc/unx/gtk/gtksys.hxx
+++ b/vcl/inc/unx/gtk/gtksys.hxx
@@ -6,8 +6,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _VCL_GTKSYS_HXX_
-#define _VCL_GTKSYS_HXX_
+#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKSYS_HXX
+#define INCLUDED_VCL_INC_UNX_GTK_GTKSYS_HXX
#include "generic/gensys.h"
#include <gtk/gtk.h>
@@ -46,6 +46,6 @@ public:
GdkScreen *getScreenMonitorFromIdx (int nIdx, gint &nMonitor);
};
-#endif // _VCL_GTKSYS_HXX_
+#endif // INCLUDED_VCL_INC_UNX_GTK_GTKSYS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/i18n_cb.hxx b/vcl/inc/unx/i18n_cb.hxx
index 74276caf1e20..4d13799dbd0a 100644
--- a/vcl/inc/unx/i18n_cb.hxx
+++ b/vcl/inc/unx/i18n_cb.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SAL_I18N_CALLBACK_HXX
-#define _SAL_I18N_CALLBACK_HXX
+#ifndef INCLUDED_VCL_INC_UNX_I18N_CB_HXX
+#define INCLUDED_VCL_INC_UNX_I18N_CB_HXX
#include <salwtype.hxx>
#include <vector>
@@ -80,6 +80,6 @@ typedef struct {
std::vector< sal_uInt16 > aInputFlags;
} preedit_data_t;
-#endif /* _SAL_I18N_CALLBACK_HXX */
+#endif // INCLUDED_VCL_INC_UNX_I18N_CB_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx
index 3a49368fc84f..603451759783 100644
--- a/vcl/inc/unx/i18n_ic.hxx
+++ b/vcl/inc/unx/i18n_ic.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SAL_I18N_INPUTCONTEXT_HXX
-#define _SAL_I18N_INPUTCONTEXT_HXX
+#ifndef INCLUDED_VCL_INC_UNX_I18N_IC_HXX
+#define INCLUDED_VCL_INC_UNX_I18N_IC_HXX
#include <i18nlangtag/lang.h>
#include "i18n_cb.hxx"
@@ -84,7 +84,7 @@ private:
};
-#endif // _SAL_I18N_INPUTCONTEXT_HXX
+#endif // INCLUDED_VCL_INC_UNX_I18N_IC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/i18n_im.hxx b/vcl/inc/unx/i18n_im.hxx
index 9a20fc55342e..0da25d677c78 100644
--- a/vcl/inc/unx/i18n_im.hxx
+++ b/vcl/inc/unx/i18n_im.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SAL_I18N_INPUTMETHOD_HXX
-#define _SAL_I18N_INPUTMETHOD_HXX
+#ifndef INCLUDED_VCL_INC_UNX_I18N_IM_HXX
+#define INCLUDED_VCL_INC_UNX_I18N_IM_HXX
#include <vclpluginapi.h>
@@ -49,7 +49,7 @@ public:
~SalI18N_InputMethod();
};
-#endif // _SAL_I18N_INPUTMETHOD_HXX
+#endif // INCLUDED_VCL_INC_UNX_I18N_IM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/i18n_keysym.hxx b/vcl/inc/unx/i18n_keysym.hxx
index bc200d0ade61..86138672e5cc 100644
--- a/vcl/inc/unx/i18n_keysym.hxx
+++ b/vcl/inc/unx/i18n_keysym.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SAL_I18N_KEYSYM_HXX
-#define _SAL_I18N_KEYSYM_HXX
+#ifndef INCLUDED_VCL_INC_UNX_I18N_KEYSYM_HXX
+#define INCLUDED_VCL_INC_UNX_I18N_KEYSYM_HXX
/*
convert a keysym as defined in /usr/{X11R6|openwin}/include/X11/keysymdef.h
@@ -58,7 +58,7 @@
sal_Unicode KeysymToUnicode (KeySym nKeySym);
-#endif /* _SAL_I18N_KEYSYM_HXX */
+#endif // INCLUDED_VCL_INC_UNX_I18N_KEYSYM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx
index f1769ed7221d..bec53de9f708 100644
--- a/vcl/inc/unx/i18n_status.hxx
+++ b/vcl/inc/unx/i18n_status.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SAL_I18N_STATUS_HXX
-#define _SAL_I18N_STATUS_HXX
+#ifndef INCLUDED_VCL_INC_UNX_I18N_STATUS_HXX
+#define INCLUDED_VCL_INC_UNX_I18N_STATUS_HXX
#include <rtl/ustring.hxx>
#include <salimestatus.hxx>
@@ -103,6 +103,6 @@ public:
} // namespace
-#endif // _SAL_I18N_STATUS_HXX
+#endif // INCLUDED_VCL_INC_UNX_I18N_STATUS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx
index d22f02b2a9cb..2c5f13942ca9 100644
--- a/vcl/inc/unx/i18n_xkb.hxx
+++ b/vcl/inc/unx/i18n_xkb.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SAL_I18N_XKBDEXTENSION_HXX
-#define _SAL_I18N_XKBDEXTENSION_HXX
+#ifndef INCLUDED_VCL_INC_UNX_I18N_XKB_HXX
+#define INCLUDED_VCL_INC_UNX_I18N_XKB_HXX
#include <sal/types.h>
#include <vclpluginapi.h>
@@ -89,6 +89,6 @@ SalI18N_KeyboardExtension::GetEventBase() const
return mnEventBase;
}
-#endif // _SAL_I18N_XKBDEXTENSION_HXX
+#endif // INCLUDED_VCL_INC_UNX_I18N_XKB_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/kde/kdedata.hxx b/vcl/inc/unx/kde/kdedata.hxx
index b29a0726c6f8..249dde6359c5 100644
--- a/vcl/inc/unx/kde/kdedata.hxx
+++ b/vcl/inc/unx/kde/kdedata.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_KDEDATA_HXX
-#define _VCL_KDEDATA_HXX
+#ifndef INCLUDED_VCL_INC_UNX_KDE_KDEDATA_HXX
+#define INCLUDED_VCL_INC_UNX_KDE_KDEDATA_HXX
#include <unx/saldisp.hxx>
#include <unx/saldata.hxx>
@@ -105,6 +105,6 @@ public:
void doStartup();
};
-#endif // _VCL_KDEDATA_HXX
+#endif // INCLUDED_VCL_INC_UNX_KDE_KDEDATA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/saltype.h b/vcl/inc/unx/saltype.h
index c55dbee48ad2..c7d62d3a8414 100644
--- a/vcl/inc/unx/saltype.h
+++ b/vcl/inc/unx/saltype.h
@@ -6,8 +6,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SAL_TYPE_H
-#define SAL_TYPE_H
+#ifndef INCLUDED_VCL_INC_UNX_SALTYPE_H
+#define INCLUDED_VCL_INC_UNX_SALTYPE_H
// an X11 screen index - this unpleasant construct is to allow
// us to cleanly separate the 'DisplayScreen' concept - as used
@@ -22,5 +22,5 @@ public:
bool operator!=(const SalX11Screen &rOther) { return rOther.mnXScreen != mnXScreen; }
};
-#endif // SAL_TYPE_H
+#endif // INCLUDED_VCL_INC_UNX_SALTYPE_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salunx.h b/vcl/inc/unx/salunx.h
index 0606736c170b..13bb033dbbdf 100644
--- a/vcl/inc/unx/salunx.h
+++ b/vcl/inc/unx/salunx.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SALUNX_H
-#define _SALUNX_H
+#ifndef INCLUDED_VCL_INC_UNX_SALUNX_H
+#define INCLUDED_VCL_INC_UNX_SALUNX_H
#include <prex.h>
#include <postx.h>
diff --git a/vcl/inc/unx/salunxtime.h b/vcl/inc/unx/salunxtime.h
index a10033b3ee06..aa6f4a266396 100644
--- a/vcl/inc/unx/salunxtime.h
+++ b/vcl/inc/unx/salunxtime.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SALUNX_TIME_H
-#define _SALUNX_TIME_H
+#ifndef INCLUDED_VCL_INC_UNX_SALUNXTIME_H
+#define INCLUDED_VCL_INC_UNX_SALUNXTIME_H
#if defined LINUX || defined FREEBSD || \
defined NETBSD || defined OPENBSD || defined DRAGONFLY
@@ -105,6 +105,6 @@ inline timeval operator - ( const timeval &t1, const timeval &t2 )
return t0 -= t2;
}
-#endif // _SALUNX_TIME_H
+#endif // INCLUDED_VCL_INC_UNX_SALUNXTIME_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/sm.hxx b/vcl/inc/unx/sm.hxx
index 29897289637e..3aee67a02d9a 100644
--- a/vcl/inc/unx/sm.hxx
+++ b/vcl/inc/unx/sm.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_SM_HXX
-#define _VCL_SM_HXX
+#ifndef INCLUDED_VCL_INC_UNX_SM_HXX
+#define INCLUDED_VCL_INC_UNX_SM_HXX
#include "sal/config.h"
diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx
index 2c2ee3b38c13..e62ecce3e57e 100644
--- a/vcl/inc/unx/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _VCL_WMADAPTOR_HXX_
-#define _VCL_WMADAPTOR_HXX_
+#ifndef INCLUDED_VCL_INC_UNX_WMADAPTOR_HXX
+#define INCLUDED_VCL_INC_UNX_WMADAPTOR_HXX
#include <rtl/ustring.hxx>
#include <tools/gen.hxx>
diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx
index b5edfa9a5ebb..60128a9adc0d 100644
--- a/vcl/inc/unx/x11/x11sys.hxx
+++ b/vcl/inc/unx/x11/x11sys.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_X11SYS_H
-#define _SV_X11SYS_H
+#ifndef INCLUDED_VCL_INC_UNX_X11_X11SYS_HXX
+#define INCLUDED_VCL_INC_UNX_X11_X11SYS_HXX
#include <tools/solar.h>
#include <osl/mutex.hxx>
@@ -44,6 +44,6 @@ public:
int nDefButton );
};
-#endif // _SV_X11SYS_H
+#endif // INCLUDED_VCL_INC_UNX_X11_X11SYS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */