jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve #include guard macros

Browse source 
Avoid using reserved identifiers such as `_DOHINT_H` (fixes #1989),
fix cases where the name doesn't match the filename, and make the naming
more consistent and less likely to collide with include guards in other
headers.
This commit is contained in:
Olly Betts 2022-07-19 08:14:07 +12:00 • committed by Olly Betts
commit 892557e799
21 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/CParse/cparse.h
View file

@ -11,8 +11,8 @@
* SWIG parser module.
* ----------------------------------------------------------------------------- */
#ifndef SWIG_CPARSE_H_
#define SWIG_CPARSE_H_
#ifndef SWIG_CPARSE_H
#define SWIG_CPARSE_H
#include "swig.h"
#include "swigwarn.h"

6
Source/DOH/doh.h
View file

@ -11,8 +11,8 @@
* This file describes of the externally visible functions in DOH.
* ----------------------------------------------------------------------------- */
#ifndef _DOH_H
#define _DOH_H
#ifndef SWIG_DOH_H
#define SWIG_DOH_H
#ifndef MACSWIG
#include "swigconfig.h"
@ -503,4 +503,4 @@ extern void DohMemoryDebug(void);
# pragma GCC poison abort exit
#endif
#endif /* DOH_H */
#endif /* SWIG_DOH_H */

6
Source/DOH/dohint.h
View file

@ -11,8 +11,8 @@
* This file describes internally managed objects.
* ----------------------------------------------------------------------------- */
#ifndef _DOHINT_H
#define _DOHINT_H
#ifndef SWIG_DOHINT_H
#define SWIG_DOHINT_H
#include "doh.h"
@ -128,4 +128,4 @@ typedef struct {
extern DOH *DohObjMalloc(DohObjInfo *type, void *data); /* Allocate a DOH object */
extern void DohObjFree(DOH *ptr); /* Free a DOH object */
#endif /* DOHINT_H */
#endif /* SWIG_DOHINT_H */

4
Source/Doxygen/doxyentity.h
View file

@ -11,8 +11,8 @@
* Part of the Doxygen comment translation module of SWIG.
* ----------------------------------------------------------------------------- */
#ifndef DOXYGENENTITY_H_
#define DOXYGENENTITY_H_
#ifndef SWIG_DOXYENTITY_H
#define SWIG_DOXYENTITY_H
#include <string>
#include <list>

4
Source/Doxygen/doxyparser.h
View file

@ -9,8 +9,8 @@
* doxyparser.h
* ----------------------------------------------------------------------------- */
#ifndef DOXYGENPARSER_H_
#define DOXYGENPARSER_H_
#ifndef SWIG_DOXYPARSER_H
#define SWIG_DOXYPARSER_H
#include <string>
#include <list>
#include <map>

4
Source/Doxygen/doxytranslator.h
View file

@ -12,8 +12,8 @@
* systems.
* ----------------------------------------------------------------------------- */
#ifndef DOXYGENTRANSLATOR_H_
#define DOXYGENTRANSLATOR_H_
#ifndef SWIG_DOXYTRANSLATOR_H
#define SWIG_DOXYTRANSLATOR_H
#include "swig.h"
#include "doxyentity.h"

4
Source/Doxygen/javadoc.h
View file

@ -11,8 +11,8 @@
* Module to return documentation for nodes formatted for JavaDoc
* ----------------------------------------------------------------------------- */
#ifndef JAVADOCCONVERTER_H_
#define JAVADOCCONVERTER_H_
#ifndef SWIG_JAVADOC_H
#define SWIG_JAVADOC_H
#include "doxytranslator.h"
#include <map>

4
Source/Doxygen/pydoc.h
View file

@ -11,8 +11,8 @@
* Module to return documentation for nodes formatted for PyDoc
* ----------------------------------------------------------------------------- */
#ifndef PYDOCCONVERTER_H_
#define PYDOCCONVERTER_H_
#ifndef SWIG_PYDOC_H
#define SWIG_PYDOC_H
#include <list>
#include <string>

4
Source/Include/swigwarn.h
View file

@ -22,8 +22,8 @@
* This file is used as the input for generating Lib/swigwarn.swg.
* ----------------------------------------------------------------------------- */
#ifndef SWIGWARN_H_
#define SWIGWARN_H_
#ifndef SWIG_SWIGWARN_H
#define SWIG_SWIGWARN_H
#define WARN_NONE 0

4
Source/Modules/swigmod.h
View file

@ -11,8 +11,8 @@
* Main header file for SWIG modules.
* ----------------------------------------------------------------------------- */
#ifndef SWIG_SWIGMOD_H_
#define SWIG_SWIGMOD_H_
#ifndef SWIG_SWIGMOD_H
#define SWIG_SWIGMOD_H
#include "swig.h"
#include "preprocessor.h"

4
Source/Preprocessor/preprocessor.h
View file

@ -11,8 +11,8 @@
* SWIG preprocessor module.
* ----------------------------------------------------------------------------- */
#ifndef SWIG_PREPROCESSOR_H_
#define SWIG_PREPROCESSOR_H_
#ifndef SWIG_PREPROCESSOR_H
#define SWIG_PREPROCESSOR_H
#include "swigwarn.h"

4
Source/Swig/swig.h
View file

@ -11,8 +11,8 @@
* Header file for the SWIG core.
* ----------------------------------------------------------------------------- */
#ifndef SWIGCORE_H_
#define SWIGCORE_H_
#ifndef SWIG_SWIG_H
#define SWIG_SWIG_H
#ifndef MACSWIG
#include "swigconfig.h"