summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-04-11 23:54:16 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-04-12 15:50:25 +0200
commit703d4020d4df0deabcbd40b9b3e4aa038ba68f0b (patch)
tree78fc056638bccd7c5334418e11238aff99ae234f
parent374b06c7d2d46bc58896360f957df599ccc1d13e (diff)
Avoid reserved identifier
Change-Id: I443d7d82de72841b1ac1f2ed026c647e3f1957fc
-rw-r--r--dbaccess/source/shared/dbu_reghelper.cxx4
-rw-r--r--dbaccess/source/shared/flt_reghelper.cxx4
-rw-r--r--dbaccess/source/shared/registrationhelper.cxx2
3 files changed, 5 insertions, 5 deletions
diff --git a/dbaccess/source/shared/dbu_reghelper.cxx b/dbaccess/source/shared/dbu_reghelper.cxx
index d7ea30eae019..dd05c4c9b83b 100644
--- a/dbaccess/source/shared/dbu_reghelper.cxx
+++ b/dbaccess/source/shared/dbu_reghelper.cxx
@@ -26,9 +26,9 @@
namespace dbaui
{
- #define _REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
+ #define REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
#include "registrationhelper.cxx"
- #undef _REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
+ #undef REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
}
diff --git a/dbaccess/source/shared/flt_reghelper.cxx b/dbaccess/source/shared/flt_reghelper.cxx
index 022c62c9afe5..ca60a1cb4f7b 100644
--- a/dbaccess/source/shared/flt_reghelper.cxx
+++ b/dbaccess/source/shared/flt_reghelper.cxx
@@ -26,9 +26,9 @@
namespace dbaxml
{
- #define _REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
+ #define REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
#include "registrationhelper.cxx"
- #undef _REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
+ #undef REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
}
diff --git a/dbaccess/source/shared/registrationhelper.cxx b/dbaccess/source/shared/registrationhelper.cxx
index bac0be8a28aa..490962e55ccf 100644
--- a/dbaccess/source/shared/registrationhelper.cxx
+++ b/dbaccess/source/shared/registrationhelper.cxx
@@ -19,7 +19,7 @@
// be included in other cxx files
-#ifndef _REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
+#ifndef REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
#error "don't build this file directly! use dbu_reghelper.cxx instead!"
#endif