summaryrefslogtreecommitdiff
path: root/rsc
diff options
context:
space:
mode:
Diffstat (limited to 'rsc')
-rw-r--r--rsc/inc/rscall.h6
-rw-r--r--rsc/inc/rscarray.hxx4
-rw-r--r--rsc/inc/rscclass.hxx6
-rw-r--r--rsc/inc/rscclobj.hxx6
-rw-r--r--rsc/inc/rscconst.hxx6
-rw-r--r--rsc/inc/rsccont.hxx6
-rw-r--r--rsc/inc/rscdb.hxx4
-rw-r--r--rsc/inc/rscdef.hxx6
-rw-r--r--rsc/inc/rscerror.h6
-rw-r--r--rsc/inc/rscflag.hxx6
-rw-r--r--rsc/inc/rschash.hxx6
-rw-r--r--rsc/inc/rsckey.hxx6
-rw-r--r--rsc/inc/rscmgr.hxx6
-rw-r--r--rsc/inc/rscpar.hxx6
-rw-r--r--rsc/inc/rscrange.hxx6
-rw-r--r--rsc/inc/rscrsc.hxx6
-rw-r--r--rsc/inc/rscstr.hxx6
-rw-r--r--rsc/inc/rsctools.hxx6
-rw-r--r--rsc/inc/rsctop.hxx6
-rw-r--r--rsc/inc/rsctree.hxx6
-rw-r--r--rsc/source/parser/rsclex.cxx2
21 files changed, 58 insertions, 60 deletions
diff --git a/rsc/inc/rscall.h b/rsc/inc/rscall.h
index b1b919205304..74bcf0b80ea7 100644
--- a/rsc/inc/rscall.h
+++ b/rsc/inc/rscall.h
@@ -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 _RSCALL_H
-#define _RSCALL_H
+#ifndef INCLUDED_RSC_INC_RSCALL_H
+#define INCLUDED_RSC_INC_RSCALL_H
#include <rsctools.hxx>
#include <rscerror.h>
@@ -101,6 +101,6 @@ struct SUBINFO_STRUCT
/******************* F u n c t i o n *************************************/
void InitRscCompiler();
-#endif // _RSCALL_H
+#endif // INCLUDED_RSC_INC_RSCALL_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx
index cd55d07679e6..fc40e3fbf357 100644
--- a/rsc/inc/rscarray.hxx
+++ b/rsc/inc/rscarray.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 _RSCARRAY_HXX
-#define _RSCARRAY_HXX
+#ifndef INCLUDED_RSC_INC_RSCARRAY_HXX
+#define INCLUDED_RSC_INC_RSCARRAY_HXX
#include <rscall.h>
#include <rscerror.h>
diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx
index 6db763227d8a..7d2b09e35552 100644
--- a/rsc/inc/rscclass.hxx
+++ b/rsc/inc/rscclass.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 _RSCCLASS_HXX
-#define _RSCCLASS_HXX
+#ifndef INCLUDED_RSC_INC_RSCCLASS_HXX
+#define INCLUDED_RSC_INC_RSCCLASS_HXX
#include <rscall.h>
#include <rscerror.h>
@@ -115,6 +115,6 @@ public:
RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE;
};
-#endif //_RSCCLASS_HXX
+#endif // INCLUDED_RSC_INC_RSCCLASS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscclobj.hxx b/rsc/inc/rscclobj.hxx
index 24b2d8b3d385..8cc515889976 100644
--- a/rsc/inc/rscclobj.hxx
+++ b/rsc/inc/rscclobj.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 _RSCCLOBJ_HXX
-#define _RSCCLOBJ_HXX
+#ifndef INCLUDED_RSC_INC_RSCCLOBJ_HXX
+#define INCLUDED_RSC_INC_RSCCLOBJ_HXX
#include <rsctree.hxx>
#include <rscdef.hxx>
@@ -90,6 +90,6 @@ public:
}
};
-#endif // _RSCCLOBJ_HXX
+#endif // INCLUDED_RSC_INC_RSCCLOBJ_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx
index cc76a3a79493..a574f951ee72 100644
--- a/rsc/inc/rscconst.hxx
+++ b/rsc/inc/rscconst.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 _RSCCONST_HXX
-#define _RSCCONST_HXX
+#ifndef INCLUDED_RSC_INC_RSCCONST_HXX
+#define INCLUDED_RSC_INC_RSCCONST_HXX
#include <rscall.h>
#include <rscerror.h>
@@ -97,6 +97,6 @@ public:
Atom AddLanguage( const char* pLang, RscNameTable& rNames );
};
-#endif // _RSCCONST_HXX
+#endif // INCLUDED_RSC_INC_RSCCONST_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rsccont.hxx b/rsc/inc/rsccont.hxx
index 3e1f51b2e721..2cc19880d599 100644
--- a/rsc/inc/rsccont.hxx
+++ b/rsc/inc/rsccont.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 _RSCCONT_HXX
-#define _RSCCONT_HXX
+#ifndef INCLUDED_RSC_INC_RSCCONT_HXX
+#define INCLUDED_RSC_INC_RSCCONT_HXX
#include <rscall.h>
#include <rscerror.h>
@@ -134,6 +134,6 @@ public:
RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE;
};
-#endif //_RSCCONT_HXX
+#endif // INCLUDED_RSC_INC_RSCCONT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 7708d981d951..b824483058f6 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RSCDB_HXX
-#define _RSCDB_HXX
+#ifndef INCLUDED_RSC_INC_RSCDB_HXX
+#define INCLUDED_RSC_INC_RSCDB_HXX
#include <rscall.h>
#include <rsckey.hxx>
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx
index c38f3d9682a2..069701298421 100644
--- a/rsc/inc/rscdef.hxx
+++ b/rsc/inc/rscdef.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 _RSCDEF_HXX
-#define _RSCDEF_HXX
+#ifndef INCLUDED_RSC_INC_RSCDEF_HXX
+#define INCLUDED_RSC_INC_RSCDEF_HXX
#include <tools/unqidx.hxx>
#include <rsctree.hxx>
@@ -267,6 +267,6 @@ public:
RscFile * GetFile( sal_uLong lFileKey ){ return Get( lFileKey ); }
};
-#endif // _RSCDEF_HXX
+#endif // INCLUDED_RSC_INC_RSCDEF_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscerror.h b/rsc/inc/rscerror.h
index 4e7706cae70b..7cab3d52cefe 100644
--- a/rsc/inc/rscerror.h
+++ b/rsc/inc/rscerror.h
@@ -19,8 +19,8 @@
#include <sal/types.h>
-#ifndef _RSCERROR_H
-#define _RSCERROR_H
+#ifndef INCLUDED_RSC_INC_RSCERROR_H
+#define INCLUDED_RSC_INC_RSCERROR_H
// Return errors
#define ERR_OK 0xFFFFFFFF
@@ -147,6 +147,6 @@ public:
const char * pMessage = NULL );
};
-#endif // _RSCERROR_H
+#endif // INCLUDED_RSC_INC_RSCERROR_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscflag.hxx b/rsc/inc/rscflag.hxx
index 2d77fa2090a7..875ebadabf92 100644
--- a/rsc/inc/rscflag.hxx
+++ b/rsc/inc/rscflag.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 _RSCFLAG_HXX
-#define _RSCFLAG_HXX
+#ifndef INCLUDED_RSC_INC_RSCFLAG_HXX
+#define INCLUDED_RSC_INC_RSCFLAG_HXX
#include <rscall.h>
#include <rscerror.h>
@@ -100,6 +100,6 @@ public:
RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE;
};
-#endif // _RSCFLAG_HXX
+#endif // INCLUDED_RSC_INC_RSCFLAG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rschash.hxx b/rsc/inc/rschash.hxx
index b8f734445394..9eced4737414 100644
--- a/rsc/inc/rschash.hxx
+++ b/rsc/inc/rschash.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 _RSCHASH_HXX
-#define _RSCHASH_HXX
+#ifndef INCLUDED_RSC_INC_RSCHASH_HXX
+#define INCLUDED_RSC_INC_RSCHASH_HXX
#include <sal/types.h>
#include <rtl/string.hxx>
@@ -42,6 +42,6 @@ class AtomContainer
};
-#endif // _RSCHASH_HXX
+#endif // INCLUDED_RSC_INC_RSCHASH_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rsckey.hxx b/rsc/inc/rsckey.hxx
index 5b79b7f18940..099b20cef580 100644
--- a/rsc/inc/rsckey.hxx
+++ b/rsc/inc/rsckey.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 _RSCKEY_HXX
-#define _RSCKEY_HXX
+#ifndef INCLUDED_RSC_INC_RSCKEY_HXX
+#define INCLUDED_RSC_INC_RSCKEY_HXX
// class forwards
class RscTop;
@@ -49,6 +49,6 @@ public:
bool Get( Atom nName, KEY_STRUCT * pEle );
};
-#endif// _RSCKEY_HXX
+#endif // INCLUDED_RSC_INC_RSCKEY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscmgr.hxx b/rsc/inc/rscmgr.hxx
index 57ff85a016af..48f09becf533 100644
--- a/rsc/inc/rscmgr.hxx
+++ b/rsc/inc/rscmgr.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 _RSCMGR_HXX
-#define _RSCMGR_HXX
+#ifndef INCLUDED_RSC_INC_RSCMGR_HXX
+#define INCLUDED_RSC_INC_RSCMGR_HXX
#include <rscall.h>
#include <rscerror.h>
@@ -62,6 +62,6 @@ public:
ERRTYPE SetRef( const RSCINST & rInst, const RscId & rRefId ) SAL_OVERRIDE;
};
-#endif //_RSCMGR_HXX
+#endif // INCLUDED_RSC_INC_RSCMGR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscpar.hxx b/rsc/inc/rscpar.hxx
index 78f64fc6b83a..0b9bc4cb0afc 100644
--- a/rsc/inc/rscpar.hxx
+++ b/rsc/inc/rscpar.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 _RSCPAR_HXX
-#define _RSCPAR_HXX
+#ifndef INCLUDED_RSC_INC_RSCPAR_HXX
+#define INCLUDED_RSC_INC_RSCPAR_HXX
#include <rsctools.hxx>
#include <rscerror.h>
@@ -77,6 +77,6 @@ public:
void IncludeParser( RscFileInst * pFileInst );
ERRTYPE parser( RscFileInst * pFileInst );
-#endif // _RSCPAR_HXX
+#endif // INCLUDED_RSC_INC_RSCPAR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscrange.hxx b/rsc/inc/rscrange.hxx
index 91d88ff5efb8..daea501c57dc 100644
--- a/rsc/inc/rscrange.hxx
+++ b/rsc/inc/rscrange.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 _RSCRANGE_HXX
-#define _RSCRANGE_HXX
+#ifndef INCLUDED_RSC_INC_RSCRANGE_HXX
+#define INCLUDED_RSC_INC_RSCRANGE_HXX
#include <rscall.h>
#include <rscerror.h>
@@ -183,6 +183,6 @@ public:
ERRTYPE SetNumber( const RSCINST &, sal_Int32 ) SAL_OVERRIDE;
};
-#endif // _RSCRANGE_HXX
+#endif // INCLUDED_RSC_INC_RSCRANGE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx
index 182beec9a316..5842276c0d8d 100644
--- a/rsc/inc/rscrsc.hxx
+++ b/rsc/inc/rscrsc.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 _RSCRSC_HXX
-#define _RSCRSC_HXX
+#ifndef INCLUDED_RSC_INC_RSCRSC_HXX
+#define INCLUDED_RSC_INC_RSCRSC_HXX
#include <rscall.h>
#include <rscerror.h>
@@ -102,6 +102,6 @@ public:
void EndCompile();
};
-#endif //_RSCRSC_HXX
+#endif // INCLUDED_RSC_INC_RSCRSC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscstr.hxx b/rsc/inc/rscstr.hxx
index e56e396c583a..2b8ba770783d 100644
--- a/rsc/inc/rscstr.hxx
+++ b/rsc/inc/rscstr.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 _RSCSTR_HXX
-#define _RSCSTR_HXX
+#ifndef INCLUDED_RSC_INC_RSCSTR_HXX
+#define INCLUDED_RSC_INC_RSCSTR_HXX
#include <rscall.h>
#include <rscerror.h>
@@ -63,6 +63,6 @@ public:
RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE;
};
-#endif // _RSCSTR_HXX
+#endif // INCLUDED_RSC_INC_RSCSTR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx
index 7fd10682b39c..e8d71fd541dd 100644
--- a/rsc/inc/rsctools.hxx
+++ b/rsc/inc/rsctools.hxx
@@ -19,8 +19,8 @@
struct RSHEADER_TYPE;
class RscPtrPtr;
-#ifndef _RSCTOOLS_HXX
-#define _RSCTOOLS_HXX
+#ifndef INCLUDED_RSC_INC_RSCTOOLS_HXX
+#define INCLUDED_RSC_INC_RSCTOOLS_HXX
#ifdef UNX
#include <stdlib.h>
@@ -210,6 +210,6 @@ public:
}
};
-#endif // _RSCTOOLS_HXX
+#endif // INCLUDED_RSC_INC_RSCTOOLS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx
index 0929db770d4c..4570dd0752a5 100644
--- a/rsc/inc/rsctop.hxx
+++ b/rsc/inc/rsctop.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 _RSCTOP_HXX
-#define _RSCTOP_HXX
+#ifndef INCLUDED_RSC_INC_RSCTOP_HXX
+#define INCLUDED_RSC_INC_RSCTOP_HXX
#include <rscerror.h>
#include <rsctools.hxx>
@@ -215,6 +215,6 @@ public:
RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra );
};
-#endif //_RSCTOP_HXX
+#endif // INCLUDED_RSC_INC_RSCTOP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rsctree.hxx b/rsc/inc/rsctree.hxx
index 9d4ec944bfa5..29c4f15122e5 100644
--- a/rsc/inc/rsctree.hxx
+++ b/rsc/inc/rsctree.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 _RSCTREE_HXX
-#define _RSCTREE_HXX
+#ifndef INCLUDED_RSC_INC_RSCTREE_HXX
+#define INCLUDED_RSC_INC_RSCTREE_HXX
#include <tools/link.hxx>
#include <rsctools.hxx>
@@ -101,6 +101,6 @@ public:
OString GetName() const { return m_aName; }
};
-#endif // _RSCTREE_HXX
+#endif // INCLUDED_RSC_INC_RSCTREE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx
index 6c261c4282ac..cfc85a289c04 100644
--- a/rsc/source/parser/rsclex.cxx
+++ b/rsc/source/parser/rsclex.cxx
@@ -23,9 +23,7 @@
#include <ctype.h>
#include <limits.h>
-#ifdef _RSCERROR_H
#include <rscerror.h>
-#endif
#include <rschash.hxx>
#include <rscdb.hxx>
#include <rsctop.hxx>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 08:19:39 +0000