Commit 3873f5fd9bd366c645eb221d0e75c0deaa2de24c

Authored by Jay Berkenbilt
1 parent 932799ba

Protect headers with compliant identifiers (fixes #233)

Showing 69 changed files with 205 additions and 205 deletions
include/qpdf/Buffer.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __BUFFER_HH__
23   -#define __BUFFER_HH__
  22 +#ifndef BUFFER_HH
  23 +#define BUFFER_HH
24 24  
25 25 #include <qpdf/DLL.h>
26 26 #include <cstring> // for size_t
... ... @@ -64,4 +64,4 @@ class Buffer
64 64 unsigned char* buf;
65 65 };
66 66  
67   -#endif // __BUFFER_HH__
  67 +#endif // BUFFER_HH
... ...
include/qpdf/BufferInputSource.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __QPDF_BUFFERINPUTSOURCE_HH__
23   -#define __QPDF_BUFFERINPUTSOURCE_HH__
  22 +#ifndef QPDF_BUFFERINPUTSOURCE_HH
  23 +#define QPDF_BUFFERINPUTSOURCE_HH
24 24  
25 25 #include <qpdf/InputSource.hh>
26 26 #include <qpdf/Buffer.hh>
... ... @@ -60,4 +60,4 @@ class BufferInputSource: public InputSource
60 60 qpdf_offset_t cur_offset;
61 61 };
62 62  
63   -#endif // __QPDF_BUFFERINPUTSOURCE_HH__
  63 +#endif // QPDF_BUFFERINPUTSOURCE_HH
... ...
include/qpdf/ClosedFileInputSource.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __QPDF_CLOSEDFILEINPUTSOURCE_HH__
23   -#define __QPDF_CLOSEDFILEINPUTSOURCE_HH__
  22 +#ifndef QPDF_CLOSEDFILEINPUTSOURCE_HH
  23 +#define QPDF_CLOSEDFILEINPUTSOURCE_HH
24 24  
25 25 // This is an input source that reads from files, like
26 26 // FileInputSource, except that it opens and close the file
... ... @@ -88,4 +88,4 @@ class ClosedFileInputSource: public InputSource
88 88 PointerHolder<Members> m;
89 89 };
90 90  
91   -#endif // __QPDF_CLOSEDFILEINPUTSOURCE_HH__
  91 +#endif // QPDF_CLOSEDFILEINPUTSOURCE_HH
... ...
include/qpdf/Constants.h
... ... @@ -20,8 +20,8 @@
20 20 * see the manual for additional information.
21 21 */
22 22  
23   -#ifndef __QPDFCONSTANTS_H__
24   -#define __QPDFCONSTANTS_H__
  23 +#ifndef QPDFCONSTANTS_H
  24 +#define QPDFCONSTANTS_H
25 25  
26 26 /* Keep this file 'C' compatible so it can be used from the C and C++
27 27 * interfaces.
... ... @@ -89,4 +89,4 @@ enum qpdf_r3_modify_e /* Allowed changes: */
89 89 qpdf_r3m_none /* no modifications */
90 90 };
91 91  
92   -#endif /* __QPDFCONSTANTS_H__ */
  92 +#endif /* QPDFCONSTANTS_H */
... ...
include/qpdf/DLL.h
... ... @@ -20,8 +20,8 @@
20 20 * see the manual for additional information.
21 21 */
22 22  
23   -#ifndef __QPDF_DLL_HH__
24   -#define __QPDF_DLL_HH__
  23 +#ifndef QPDF_DLL_HH
  24 +#define QPDF_DLL_HH
25 25  
26 26 #if defined(_WIN32) && defined(DLL_EXPORT)
27 27 # define QPDF_DLL __declspec(dllexport)
... ... @@ -29,4 +29,4 @@
29 29 # define QPDF_DLL
30 30 #endif
31 31  
32   -#endif /* __QPDF_DLL_HH__ */
  32 +#endif /* QPDF_DLL_HH */
... ...
include/qpdf/FileInputSource.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __QPDF_FILEINPUTSOURCE_HH__
23   -#define __QPDF_FILEINPUTSOURCE_HH__
  22 +#ifndef QPDF_FILEINPUTSOURCE_HH
  23 +#define QPDF_FILEINPUTSOURCE_HH
24 24  
25 25 #include <qpdf/InputSource.hh>
26 26  
... ... @@ -61,4 +61,4 @@ class FileInputSource: public InputSource
61 61 FILE* file;
62 62 };
63 63  
64   -#endif // __QPDF_FILEINPUTSOURCE_HH__
  64 +#endif // QPDF_FILEINPUTSOURCE_HH
... ...
include/qpdf/InputSource.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __QPDF_INPUTSOURCE_HH__
23   -#define __QPDF_INPUTSOURCE_HH__
  22 +#ifndef QPDF_INPUTSOURCE_HH
  23 +#define QPDF_INPUTSOURCE_HH
24 24  
25 25 #include <qpdf/DLL.h>
26 26 #include <qpdf/Types.h>
... ... @@ -88,4 +88,4 @@ class InputSource
88 88 qpdf_offset_t last_offset;
89 89 };
90 90  
91   -#endif // __QPDF_INPUTSOURCE_HH__
  91 +#endif // QPDF_INPUTSOURCE_HH
... ...
include/qpdf/Pipeline.hh
... ... @@ -41,8 +41,8 @@
41 41 // are not. It is up to the caller to use a pipeline according to its
42 42 // own restrictions.
43 43  
44   -#ifndef __PIPELINE_HH__
45   -#define __PIPELINE_HH__
  44 +#ifndef PIPELINE_HH
  45 +#define PIPELINE_HH
46 46  
47 47 #include <qpdf/DLL.h>
48 48 #include <string>
... ... @@ -82,4 +82,4 @@ class Pipeline
82 82 Pipeline* next;
83 83 };
84 84  
85   -#endif // __PIPELINE_HH__
  85 +#endif // PIPELINE_HH
... ...
include/qpdf/Pl_Buffer.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __PL_BUFFER_HH__
23   -#define __PL_BUFFER_HH__
  22 +#ifndef PL_BUFFER_HH
  23 +#define PL_BUFFER_HH
24 24  
25 25 // This pipeline accumulates the data passed to it into a memory
26 26 // buffer. Each subsequent use of this buffer appends to the data
... ... @@ -62,4 +62,4 @@ class Pl_Buffer: public Pipeline
62 62 size_t total_size;
63 63 };
64 64  
65   -#endif // __PL_BUFFER_HH__
  65 +#endif // PL_BUFFER_HH
... ...
include/qpdf/Pl_Concatenate.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __PL_CONCATENATE_HH__
23   -#define __PL_CONCATENATE_HH__
  22 +#ifndef PL_CONCATENATE_HH
  23 +#define PL_CONCATENATE_HH
24 24  
25 25 // This pipeline will drop all regular finished calls rather than
26 26 // passing them onto next. To finish downstream streams, call
... ... @@ -50,4 +50,4 @@ class Pl_Concatenate: public Pipeline
50 50 void manualFinish();
51 51 };
52 52  
53   -#endif // __PL_CONCATENATE_HH__
  53 +#endif // PL_CONCATENATE_HH
... ...
include/qpdf/Pl_Count.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __PL_COUNT_HH__
23   -#define __PL_COUNT_HH__
  22 +#ifndef PL_COUNT_HH
  23 +#define PL_COUNT_HH
24 24  
25 25 // This pipeline is reusable; i.e., it is safe to call write() after
26 26 // calling finish().
... ... @@ -52,4 +52,4 @@ class Pl_Count: public Pipeline
52 52 unsigned char last_char;
53 53 };
54 54  
55   -#endif // __PL_COUNT_HH__
  55 +#endif // PL_COUNT_HH
... ...
include/qpdf/Pl_DCT.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __PL_DCT_HH__
23   -#define __PL_DCT_HH__
  22 +#ifndef PL_DCT_HH
  23 +#define PL_DCT_HH
24 24  
25 25 #include <qpdf/Pipeline.hh>
26 26 #include <qpdf/Pl_Buffer.hh>
... ... @@ -81,4 +81,4 @@ class Pl_DCT: public Pipeline
81 81  
82 82 };
83 83  
84   -#endif // __PL_DCT_HH__
  84 +#endif // PL_DCT_HH
... ...
include/qpdf/Pl_Discard.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __PL_DISCARD_HH__
23   -#define __PL_DISCARD_HH__
  22 +#ifndef PL_DISCARD_HH
  23 +#define PL_DISCARD_HH
24 24  
25 25 // This pipeline discards its output. It is an end-of-line pipeline
26 26 // (with no next).
... ... @@ -43,4 +43,4 @@ class Pl_Discard: public Pipeline
43 43 virtual void finish();
44 44 };
45 45  
46   -#endif // __PL_DISCARD_HH__
  46 +#endif // PL_DISCARD_HH
... ...
include/qpdf/Pl_Flate.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __PL_FLATE_HH__
23   -#define __PL_FLATE_HH__
  22 +#ifndef PL_FLATE_HH
  23 +#define PL_FLATE_HH
24 24  
25 25 #include <qpdf/Pipeline.hh>
26 26  
... ... @@ -53,4 +53,4 @@ class Pl_Flate: public Pipeline
53 53 void* zdata;
54 54 };
55 55  
56   -#endif // __PL_FLATE_HH__
  56 +#endif // PL_FLATE_HH
... ...
include/qpdf/Pl_QPDFTokenizer.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __PL_QPDFTOKENIZER_HH__
23   -#define __PL_QPDFTOKENIZER_HH__
  22 +#ifndef PL_QPDFTOKENIZER_HH
  23 +#define PL_QPDFTOKENIZER_HH
24 24  
25 25 #include <qpdf/Pipeline.hh>
26 26  
... ... @@ -80,4 +80,4 @@ class Pl_QPDFTokenizer: public Pipeline
80 80 PointerHolder<Members> m;
81 81 };
82 82  
83   -#endif // __PL_QPDFTOKENIZER_HH__
  83 +#endif // PL_QPDFTOKENIZER_HH
... ...
include/qpdf/Pl_RunLength.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __PL_RUNLENGTH_HH__
23   -#define __PL_RUNLENGTH_HH__
  22 +#ifndef PL_RUNLENGTH_HH
  23 +#define PL_RUNLENGTH_HH
24 24  
25 25 #include <qpdf/Pipeline.hh>
26 26  
... ... @@ -53,4 +53,4 @@ class Pl_RunLength: public Pipeline
53 53 unsigned int length;
54 54 };
55 55  
56   -#endif // __PL_RUNLENGTH_HH__
  56 +#endif // PL_RUNLENGTH_HH
... ...
include/qpdf/Pl_StdioFile.hh
... ... @@ -21,8 +21,8 @@
21 21  
22 22 // End-of-line pipeline that simply writes its data to a stdio FILE* object.
23 23  
24   -#ifndef __PL_STDIOFILE_HH__
25   -#define __PL_STDIOFILE_HH__
  24 +#ifndef PL_STDIOFILE_HH
  25 +#define PL_STDIOFILE_HH
26 26  
27 27 #include <qpdf/Pipeline.hh>
28 28  
... ... @@ -51,4 +51,4 @@ class Pl_StdioFile: public Pipeline
51 51 FILE* file;
52 52 };
53 53  
54   -#endif // __PL_STDIOFILE_HH__
  54 +#endif // PL_STDIOFILE_HH
... ...
include/qpdf/PointerHolder.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __POINTERHOLDER_HH__
23   -#define __POINTERHOLDER_HH__
  22 +#ifndef POINTERHOLDER_HH
  23 +#define POINTERHOLDER_HH
24 24  
25 25 // This class is basically boost::shared_pointer but predates that by
26 26 // several years.
... ... @@ -182,4 +182,4 @@ class PointerHolder
182 182 Data* data;
183 183 };
184 184  
185   -#endif // __POINTERHOLDER_HH__
  185 +#endif // POINTERHOLDER_HH
... ...
include/qpdf/QPDF.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __QPDF_HH__
23   -#define __QPDF_HH__
  22 +#ifndef QPDF_HH
  23 +#define QPDF_HH
24 24  
25 25 #include <qpdf/DLL.h>
26 26 #include <qpdf/Types.h>
... ... @@ -1240,4 +1240,4 @@ class QPDF
1240 1240 PointerHolder<Members> m;
1241 1241 };
1242 1242  
1243   -#endif // __QPDF_HH__
  1243 +#endif // QPDF_HH
... ...
include/qpdf/QPDFAcroFormDocumentHelper.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __QPDFACROFORMDOCUMENTHELPER_HH__
23   -#define __QPDFACROFORMDOCUMENTHELPER_HH__
  22 +#ifndef QPDFACROFORMDOCUMENTHELPER_HH
  23 +#define QPDFACROFORMDOCUMENTHELPER_HH
24 24  
25 25 // This document helper is intended to help with operations on
26 26 // interactive forms. Here are the key things to know:
... ... @@ -181,4 +181,4 @@ class QPDFAcroFormDocumentHelper: public QPDFDocumentHelper
181 181 PointerHolder<Members> m;
182 182 };
183 183  
184   -#endif // __QPDFACROFORMDOCUMENTHELPER_HH__
  184 +#endif // QPDFACROFORMDOCUMENTHELPER_HH
... ...
include/qpdf/QPDFAnnotationObjectHelper.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __QPDFANNOTATIONOBJECTHELPER_HH__
23   -#define __QPDFANNOTATIONOBJECTHELPER_HH__
  22 +#ifndef QPDFANNOTATIONOBJECTHELPER_HH
  23 +#define QPDFANNOTATIONOBJECTHELPER_HH
24 24  
25 25 #include <qpdf/QPDFObjectHelper.hh>
26 26  
... ... @@ -85,4 +85,4 @@ class QPDFAnnotationObjectHelper: public QPDFObjectHelper
85 85 PointerHolder<Members> m;
86 86 };
87 87  
88   -#endif // __QPDFANNOTATIONOBJECTHELPER_HH__
  88 +#endif // QPDFANNOTATIONOBJECTHELPER_HH
... ...
include/qpdf/QPDFDocumentHelper.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __QPDFDOCUMENTHELPER_HH__
23   -#define __QPDFDOCUMENTHELPER_HH__
  22 +#ifndef QPDFDOCUMENTHELPER_HH
  23 +#define QPDFDOCUMENTHELPER_HH
24 24  
25 25 #include <qpdf/DLL.h>
26 26 #include <qpdf/QPDF.hh>
... ... @@ -63,4 +63,4 @@ class QPDFDocumentHelper
63 63 QPDF& qpdf;
64 64 };
65 65  
66   -#endif // __QPDFDOCUMENTHELPER_HH__
  66 +#endif // QPDFDOCUMENTHELPER_HH
... ...
include/qpdf/QPDFExc.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __QPDFEXC_HH__
23   -#define __QPDFEXC_HH__
  22 +#ifndef QPDFEXC_HH
  23 +#define QPDFEXC_HH
24 24  
25 25 #include <qpdf/DLL.h>
26 26 #include <qpdf/Types.h>
... ... @@ -75,4 +75,4 @@ class QPDFExc: public std::runtime_error
75 75 std::string message;
76 76 };
77 77  
78   -#endif // __QPDFEXC_HH__
  78 +#endif // QPDFEXC_HH
... ...
include/qpdf/QPDFFormFieldObjectHelper.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __QPDFFORMFIELDOBJECTHELPER_HH__
23   -#define __QPDFFORMFIELDOBJECTHELPER_HH__
  22 +#ifndef QPDFFORMFIELDOBJECTHELPER_HH
  23 +#define QPDFFORMFIELDOBJECTHELPER_HH
24 24  
25 25 // This object helper helps with form fields for interactive forms.
26 26 // Please see comments in QPDFAcroFormDocumentHelper.hh for additional
... ... @@ -156,4 +156,4 @@ class QPDFFormFieldObjectHelper: public QPDFObjectHelper
156 156 PointerHolder<Members> m;
157 157 };
158 158  
159   -#endif // __QPDFFORMFIELDOBJECTHELPER_HH__
  159 +#endif // QPDFFORMFIELDOBJECTHELPER_HH
... ...
include/qpdf/QPDFObjGen.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __QPDFOBJGEN_HH__
23   -#define __QPDFOBJGEN_HH__
  22 +#ifndef QPDFOBJGEN_HH
  23 +#define QPDFOBJGEN_HH
24 24  
25 25 #include <qpdf/DLL.h>
26 26  
... ... @@ -48,4 +48,4 @@ class QPDFObjGen
48 48 int gen;
49 49 };
50 50  
51   -#endif // __QPDFOBJGEN_HH__
  51 +#endif // QPDFOBJGEN_HH
... ...
include/qpdf/QPDFObject.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __QPDFOBJECT_HH__
23   -#define __QPDFOBJECT_HH__
  22 +#ifndef QPDFOBJECT_HH
  23 +#define QPDFOBJECT_HH
24 24  
25 25 #include <qpdf/DLL.h>
26 26 #include <qpdf/PointerHolder.hh>
... ... @@ -110,4 +110,4 @@ class QPDFObject
110 110 PointerHolder<Members> m;
111 111 };
112 112  
113   -#endif // __QPDFOBJECT_HH__
  113 +#endif // QPDFOBJECT_HH
... ...
include/qpdf/QPDFObjectHandle.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __QPDFOBJECTHANDLE_HH__
23   -#define __QPDFOBJECTHANDLE_HH__
  22 +#ifndef QPDFOBJECTHANDLE_HH
  23 +#define QPDFOBJECTHANDLE_HH
24 24  
25 25 #include <qpdf/DLL.h>
26 26 #include <qpdf/Types.h>
... ... @@ -927,4 +927,4 @@ class QPDFObjectHandle
927 927 PointerHolder<Members> m;
928 928 };
929 929  
930   -#endif // __QPDFOBJECTHANDLE_HH__
  930 +#endif // QPDFOBJECTHANDLE_HH
... ...
include/qpdf/QPDFObjectHelper.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __QPDFOBJECTHELPER_HH__
23   -#define __QPDFOBJECTHELPER_HH__
  22 +#ifndef QPDFOBJECTHELPER_HH
  23 +#define QPDFOBJECTHELPER_HH
24 24  
25 25 #include <qpdf/DLL.h>
26 26  
... ... @@ -64,4 +64,4 @@ class QPDFObjectHelper
64 64 QPDFObjectHandle oh;
65 65 };
66 66  
67   -#endif // __QPDFOBJECTHELPER_HH__
  67 +#endif // QPDFOBJECTHELPER_HH
... ...
include/qpdf/QPDFPageDocumentHelper.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __QPDFPAGEDOCUMENTHELPER_HH__
23   -#define __QPDFPAGEDOCUMENTHELPER_HH__
  22 +#ifndef QPDFPAGEDOCUMENTHELPER_HH
  23 +#define QPDFPAGEDOCUMENTHELPER_HH
24 24  
25 25 #include <qpdf/QPDFDocumentHelper.hh>
26 26 #include <qpdf/QPDFPageObjectHelper.hh>
... ... @@ -97,4 +97,4 @@ class QPDFPageDocumentHelper: public QPDFDocumentHelper
97 97 PointerHolder<Members> m;
98 98 };
99 99  
100   -#endif // __QPDFPAGEDOCUMENTHELPER_HH__
  100 +#endif // QPDFPAGEDOCUMENTHELPER_HH
... ...
include/qpdf/QPDFPageObjectHelper.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __QPDFPAGEOBJECTHELPER_HH__
23   -#define __QPDFPAGEOBJECTHELPER_HH__
  22 +#ifndef QPDFPAGEOBJECTHELPER_HH
  23 +#define QPDFPAGEOBJECTHELPER_HH
24 24  
25 25 #include <qpdf/QPDFObjectHelper.hh>
26 26 #include <qpdf/QPDFAnnotationObjectHelper.hh>
... ... @@ -153,4 +153,4 @@ class QPDFPageObjectHelper: public QPDFObjectHelper
153 153 PointerHolder<Members> m;
154 154 };
155 155  
156   -#endif // __QPDFPAGEOBJECTHELPER_HH__
  156 +#endif // QPDFPAGEOBJECTHELPER_HH
... ...
include/qpdf/QPDFTokenizer.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __QPDFTOKENIZER_HH__
23   -#define __QPDFTOKENIZER_HH__
  22 +#ifndef QPDFTOKENIZER_HH
  23 +#define QPDFTOKENIZER_HH
24 24  
25 25 #include <qpdf/DLL.h>
26 26  
... ... @@ -234,4 +234,4 @@ class QPDFTokenizer
234 234 PointerHolder<Members> m;
235 235 };
236 236  
237   -#endif // __QPDFTOKENIZER_HH__
  237 +#endif // QPDFTOKENIZER_HH
... ...
include/qpdf/QPDFWriter.hh
... ... @@ -23,8 +23,8 @@
23 23 // new PDF files. See comments through the header file for additional
24 24 // details.
25 25  
26   -#ifndef __QPDFWRITER_HH__
27   -#define __QPDFWRITER_HH__
  26 +#ifndef QPDFWRITER_HH
  27 +#define QPDFWRITER_HH
28 28  
29 29 #include <qpdf/DLL.h>
30 30 #include <qpdf/Types.h>
... ... @@ -617,4 +617,4 @@ class QPDFWriter
617 617 PointerHolder<Members> m;
618 618 };
619 619  
620   -#endif // __QPDFWRITER_HH__
  620 +#endif // QPDFWRITER_HH
... ...
include/qpdf/QPDFXRefEntry.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __QPDFXREFENTRY_HH__
23   -#define __QPDFXREFENTRY_HH__
  22 +#ifndef QPDFXREFENTRY_HH
  23 +#define QPDFXREFENTRY_HH
24 24  
25 25 #include <qpdf/DLL.h>
26 26 #include <qpdf/Types.h>
... ... @@ -54,4 +54,4 @@ class QPDFXRefEntry
54 54 int field2;
55 55 };
56 56  
57   -#endif // __QPDFXREFENTRY_HH__
  57 +#endif // QPDFXREFENTRY_HH
... ...
include/qpdf/QTC.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __QTC_HH__
23   -#define __QTC_HH__
  22 +#ifndef QTC_HH
  23 +#define QTC_HH
24 24  
25 25 #include <qpdf/DLL.h>
26 26  
... ... @@ -30,4 +30,4 @@ namespace QTC
30 30 void TC(char const* const scope, char const* const ccase, int n = 0);
31 31 };
32 32  
33   -#endif // __QTC_HH__
  33 +#endif // QTC_HH
... ...
include/qpdf/QUtil.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __QUTIL_HH__
23   -#define __QUTIL_HH__
  22 +#ifndef QUTIL_HH
  23 +#define QUTIL_HH
24 24  
25 25 #include <qpdf/DLL.h>
26 26 #include <qpdf/Types.h>
... ... @@ -217,4 +217,4 @@ namespace QUtil
217 217 bool is_number(char const*);
218 218 };
219 219  
220   -#endif // __QUTIL_HH__
  220 +#endif // QUTIL_HH
... ...
include/qpdf/RandomDataProvider.hh
... ... @@ -19,8 +19,8 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef __RANDOMDATAPROVIDER_HH__
23   -#define __RANDOMDATAPROVIDER_HH__
  22 +#ifndef RANDOMDATAPROVIDER_HH
  23 +#define RANDOMDATAPROVIDER_HH
24 24  
25 25 #include <string.h> // for size_t
26 26  
... ... @@ -42,4 +42,4 @@ class RandomDataProvider
42 42 RandomDataProvider& operator=(RandomDataProvider const&);
43 43 };
44 44  
45   -#endif // __RANDOMDATAPROVIDER_HH__
  45 +#endif // RANDOMDATAPROVIDER_HH
... ...
include/qpdf/Types.h
... ... @@ -20,8 +20,8 @@
20 20 * see the manual for additional information.
21 21 */
22 22  
23   -#ifndef __QPDFTYPES_H__
24   -#define __QPDFTYPES_H__
  23 +#ifndef QPDFTYPES_H
  24 +#define QPDFTYPES_H
25 25  
26 26 /* Provide an offset type that should be as big as off_t on just about
27 27 * any system. If your compiler doesn't support C99 (or at least the
... ... @@ -30,4 +30,4 @@
30 30  
31 31 typedef long long int qpdf_offset_t;
32 32  
33   -#endif /* __QPDFTYPES_H__ */
  33 +#endif /* QPDFTYPES_H */
... ...
include/qpdf/qpdf-c.h
... ... @@ -20,8 +20,8 @@
20 20 * see the manual for additional information.
21 21 */
22 22  
23   -#ifndef __QPDF_C_H__
24   -#define __QPDF_C_H__
  23 +#ifndef QPDF_C_H
  24 +#define QPDF_C_H
25 25  
26 26 /*
27 27 * This file defines a basic "C" API for qpdf. It provides access to
... ... @@ -442,4 +442,4 @@ extern &quot;C&quot; {
442 442 #endif
443 443  
444 444  
445   -#endif /* __QPDF_C_H__ */
  445 +#endif /* QPDF_C_H */
... ...
libqpdf/qpdf/BitStream.hh
1 1 // Read bits from a bit stream. See BitWriter for writing.
2 2  
3   -#ifndef __BITSTREAM_HH__
4   -#define __BITSTREAM_HH__
  3 +#ifndef BITSTREAM_HH
  4 +#define BITSTREAM_HH
5 5  
6 6 #include <qpdf/DLL.h>
7 7  
... ... @@ -28,4 +28,4 @@ class BitStream
28 28 unsigned int bits_available;
29 29 };
30 30  
31   -#endif // __BITSTREAM_HH__
  31 +#endif // BITSTREAM_HH
... ...
libqpdf/qpdf/BitWriter.hh
1 1 // Write bits into a bit stream. See BitStream for reading.
2 2  
3   -#ifndef __BITWRITER_HH__
4   -#define __BITWRITER_HH__
  3 +#ifndef BITWRITER_HH
  4 +#define BITWRITER_HH
5 5  
6 6 #include <qpdf/DLL.h>
7 7  
... ... @@ -28,4 +28,4 @@ class BitWriter
28 28 unsigned int bit_offset;
29 29 };
30 30  
31   -#endif // __BITWRITER_HH__
  31 +#endif // BITWRITER_HH
... ...
libqpdf/qpdf/ContentNormalizer.hh
1   -#ifndef __CONTENTNORMALIZER_HH__
2   -#define __CONTENTNORMALIZER_HH__
  1 +#ifndef CONTENTNORMALIZER_HH
  2 +#define CONTENTNORMALIZER_HH
3 3  
4 4 #include <qpdf/QPDFObjectHandle.hh>
5 5  
... ... @@ -18,4 +18,4 @@ class ContentNormalizer: public QPDFObjectHandle::TokenFilter
18 18 bool last_token_was_bad;
19 19 };
20 20  
21   -#endif // __CONTENTNORMALIZER_HH__
  21 +#endif // CONTENTNORMALIZER_HH
... ...
libqpdf/qpdf/InsecureRandomDataProvider.hh
1   -#ifndef __INSECURERANDOMDATAPROVIDER_HH__
2   -#define __INSECURERANDOMDATAPROVIDER_HH__
  1 +#ifndef INSECURERANDOMDATAPROVIDER_HH
  2 +#define INSECURERANDOMDATAPROVIDER_HH
3 3  
4 4 #include <qpdf/RandomDataProvider.hh>
5 5 #include <qpdf/DLL.h>
... ... @@ -24,4 +24,4 @@ class InsecureRandomDataProvider: public RandomDataProvider
24 24 bool seeded_random;
25 25 };
26 26  
27   -#endif // __INSECURERANDOMDATAPROVIDER_HH__
  27 +#endif // INSECURERANDOMDATAPROVIDER_HH
... ...
libqpdf/qpdf/MD5.hh
1   -#ifndef __MD5_HH__
2   -#define __MD5_HH__
  1 +#ifndef MD5_HH
  2 +#define MD5_HH
3 3  
4 4 #include <qpdf/DLL.h>
5 5 #include <qpdf/qpdf-config.h>
... ... @@ -89,4 +89,4 @@ class MD5
89 89 Digest digest_val;
90 90 };
91 91  
92   -#endif // __MD5_HH__
  92 +#endif // MD5_HH
... ...
libqpdf/qpdf/OffsetInputSource.hh
1   -#ifndef __QPDF_OFFSETINPUTSOURCE_HH__
2   -#define __QPDF_OFFSETINPUTSOURCE_HH__
  1 +#ifndef QPDF_OFFSETINPUTSOURCE_HH
  2 +#define QPDF_OFFSETINPUTSOURCE_HH
3 3  
4 4 // This class implements an InputSource that proxies for an underlying
5 5 // input source but offset a specific number of bytes.
... ... @@ -26,4 +26,4 @@ class OffsetInputSource: public InputSource
26 26 qpdf_offset_t global_offset;
27 27 };
28 28  
29   -#endif // __QPDF_OFFSETINPUTSOURCE_HH__
  29 +#endif // QPDF_OFFSETINPUTSOURCE_HH
... ...
libqpdf/qpdf/Pl_AES_PDF.hh
1   -#ifndef __PL_AES_PDF_HH__
2   -#define __PL_AES_PDF_HH__
  1 +#ifndef PL_AES_PDF_HH
  2 +#define PL_AES_PDF_HH
3 3  
4 4 #include <qpdf/Pipeline.hh>
5 5 #include <qpdf/qpdf-config.h>
... ... @@ -66,4 +66,4 @@ class Pl_AES_PDF: public Pipeline
66 66 bool disable_padding;
67 67 };
68 68  
69   -#endif // __PL_AES_PDF_HH__
  69 +#endif // PL_AES_PDF_HH
... ...
libqpdf/qpdf/Pl_ASCII85Decoder.hh
1   -#ifndef __PL_ASCII85DECODER_HH__
2   -#define __PL_ASCII85DECODER_HH__
  1 +#ifndef PL_ASCII85DECODER_HH
  2 +#define PL_ASCII85DECODER_HH
3 3  
4 4 #include <qpdf/Pipeline.hh>
5 5  
... ... @@ -23,4 +23,4 @@ class Pl_ASCII85Decoder: public Pipeline
23 23 size_t eod;
24 24 };
25 25  
26   -#endif // __PL_ASCII85DECODER_HH__
  26 +#endif // PL_ASCII85DECODER_HH
... ...
libqpdf/qpdf/Pl_ASCIIHexDecoder.hh
1   -#ifndef __PL_ASCIIHEXDECODER_HH__
2   -#define __PL_ASCIIHEXDECODER_HH__
  1 +#ifndef PL_ASCIIHEXDECODER_HH
  2 +#define PL_ASCIIHEXDECODER_HH
3 3  
4 4 #include <qpdf/Pipeline.hh>
5 5  
... ... @@ -23,4 +23,4 @@ class Pl_ASCIIHexDecoder: public Pipeline
23 23 bool eod;
24 24 };
25 25  
26   -#endif // __PL_ASCIIHEXDECODER_HH__
  26 +#endif // PL_ASCIIHEXDECODER_HH
... ...
libqpdf/qpdf/Pl_LZWDecoder.hh
1   -#ifndef __PL_LZWDECODER_HH__
2   -#define __PL_LZWDECODER_HH__
  1 +#ifndef PL_LZWDECODER_HH
  2 +#define PL_LZWDECODER_HH
3 3  
4 4 #include <qpdf/Pipeline.hh>
5 5  
... ... @@ -40,4 +40,4 @@ class Pl_LZWDecoder: public Pipeline
40 40 int last_code;
41 41 };
42 42  
43   -#endif // __PL_LZWDECODER_HH__
  43 +#endif // PL_LZWDECODER_HH
... ...
libqpdf/qpdf/Pl_MD5.hh
1   -#ifndef __PL_MD5_HH__
2   -#define __PL_MD5_HH__
  1 +#ifndef PL_MD5_HH
  2 +#define PL_MD5_HH
3 3  
4 4 // This pipeline sends its output to its successor unmodified. After
5 5 // calling finish, the MD5 checksum of the data that passed through
... ... @@ -45,4 +45,4 @@ class Pl_MD5: public Pipeline
45 45 bool persist_across_finish;
46 46 };
47 47  
48   -#endif // __PL_MD5_HH__
  48 +#endif // PL_MD5_HH
... ...
libqpdf/qpdf/Pl_PNGFilter.hh
1   -#ifndef __PL_PNGFILTER_HH__
2   -#define __PL_PNGFILTER_HH__
  1 +#ifndef PL_PNGFILTER_HH
  2 +#define PL_PNGFILTER_HH
3 3  
4 4 // This pipeline applies or reverses the application of a PNG filter
5 5 // as described in the PNG specification.
... ... @@ -49,4 +49,4 @@ class Pl_PNGFilter: public Pipeline
49 49 size_t incoming;
50 50 };
51 51  
52   -#endif // __PL_PNGFILTER_HH__
  52 +#endif // PL_PNGFILTER_HH
... ...
libqpdf/qpdf/Pl_RC4.hh
1   -#ifndef __PL_RC4_HH__
2   -#define __PL_RC4_HH__
  1 +#ifndef PL_RC4_HH
  2 +#define PL_RC4_HH
3 3  
4 4 #include <qpdf/Pipeline.hh>
5 5  
... ... @@ -29,4 +29,4 @@ class Pl_RC4: public Pipeline
29 29 RC4 rc4;
30 30 };
31 31  
32   -#endif // __PL_RC4_HH__
  32 +#endif // PL_RC4_HH
... ...
libqpdf/qpdf/Pl_SHA2.hh
1   -#ifndef __PL_SHA2_HH__
2   -#define __PL_SHA2_HH__
  1 +#ifndef PL_SHA2_HH
  2 +#define PL_SHA2_HH
3 3  
4 4 // Bits must be a supported number of bits, currently only 256, 384,
5 5 // or 512. Passing 0 as bits leaves the pipeline uncommitted, in
... ... @@ -47,4 +47,4 @@ class Pl_SHA2: public Pipeline
47 47 unsigned char sha512sum[64];
48 48 };
49 49  
50   -#endif // __PL_SHA2_HH__
  50 +#endif // PL_SHA2_HH
... ...
libqpdf/qpdf/Pl_TIFFPredictor.hh
1   -#ifndef __PL_TIFFPREDICTOR_HH__
2   -#define __PL_TIFFPREDICTOR_HH__
  1 +#ifndef PL_TIFFPREDICTOR_HH
  2 +#define PL_TIFFPREDICTOR_HH
3 3  
4 4 // This pipeline reverses the application of a TIFF predictor as
5 5 // described in the TIFF specification.
... ... @@ -36,4 +36,4 @@ class Pl_TIFFPredictor: public Pipeline
36 36 size_t pos;
37 37 };
38 38  
39   -#endif // __PL_TIFFPREDICTOR_HH__
  39 +#endif // PL_TIFFPREDICTOR_HH
... ...
libqpdf/qpdf/QPDF_Array.hh
1   -#ifndef __QPDF_ARRAY_HH__
2   -#define __QPDF_ARRAY_HH__
  1 +#ifndef QPDF_ARRAY_HH
  2 +#define QPDF_ARRAY_HH
3 3  
4 4 #include <qpdf/QPDFObject.hh>
5 5  
... ... @@ -33,4 +33,4 @@ class QPDF_Array: public QPDFObject
33 33 std::vector<QPDFObjectHandle> items;
34 34 };
35 35  
36   -#endif // __QPDF_ARRAY_HH__
  36 +#endif // QPDF_ARRAY_HH
... ...
libqpdf/qpdf/QPDF_Bool.hh
1   -#ifndef __QPDF_BOOL_HH__
2   -#define __QPDF_BOOL_HH__
  1 +#ifndef QPDF_BOOL_HH
  2 +#define QPDF_BOOL_HH
3 3  
4 4 #include <qpdf/QPDFObject.hh>
5 5  
... ... @@ -17,4 +17,4 @@ class QPDF_Bool: public QPDFObject
17 17 bool val;
18 18 };
19 19  
20   -#endif // __QPDF_BOOL_HH__
  20 +#endif // QPDF_BOOL_HH
... ...
libqpdf/qpdf/QPDF_Dictionary.hh
1   -#ifndef __QPDF_DICTIONARY_HH__
2   -#define __QPDF_DICTIONARY_HH__
  1 +#ifndef QPDF_DICTIONARY_HH
  2 +#define QPDF_DICTIONARY_HH
3 3  
4 4 #include <qpdf/QPDFObject.hh>
5 5  
... ... @@ -40,4 +40,4 @@ class QPDF_Dictionary: public QPDFObject
40 40 std::map<std::string, QPDFObjectHandle> items;
41 41 };
42 42  
43   -#endif // __QPDF_DICTIONARY_HH__
  43 +#endif // QPDF_DICTIONARY_HH
... ...
libqpdf/qpdf/QPDF_InlineImage.hh
1   -#ifndef __QPDF_INLINEIMAGE_HH__
2   -#define __QPDF_INLINEIMAGE_HH__
  1 +#ifndef QPDF_INLINEIMAGE_HH
  2 +#define QPDF_INLINEIMAGE_HH
3 3  
4 4 #include <qpdf/QPDFObject.hh>
5 5  
... ... @@ -17,4 +17,4 @@ class QPDF_InlineImage: public QPDFObject
17 17 std::string val;
18 18 };
19 19  
20   -#endif // __QPDF_INLINEIMAGE_HH__
  20 +#endif // QPDF_INLINEIMAGE_HH
... ...
libqpdf/qpdf/QPDF_Integer.hh
1   -#ifndef __QPDF_INTEGER_HH__
2   -#define __QPDF_INTEGER_HH__
  1 +#ifndef QPDF_INTEGER_HH
  2 +#define QPDF_INTEGER_HH
3 3  
4 4 #include <qpdf/QPDFObject.hh>
5 5  
... ... @@ -17,4 +17,4 @@ class QPDF_Integer: public QPDFObject
17 17 long long val;
18 18 };
19 19  
20   -#endif // __QPDF_INTEGER_HH__
  20 +#endif // QPDF_INTEGER_HH
... ...
libqpdf/qpdf/QPDF_Name.hh
1   -#ifndef __QPDF_NAME_HH__
2   -#define __QPDF_NAME_HH__
  1 +#ifndef QPDF_NAME_HH
  2 +#define QPDF_NAME_HH
3 3  
4 4 #include <qpdf/QPDFObject.hh>
5 5  
... ... @@ -20,4 +20,4 @@ class QPDF_Name: public QPDFObject
20 20 std::string name;
21 21 };
22 22  
23   -#endif // __QPDF_NAME_HH__
  23 +#endif // QPDF_NAME_HH
... ...
libqpdf/qpdf/QPDF_Null.hh
1   -#ifndef __QPDF_NULL_HH__
2   -#define __QPDF_NULL_HH__
  1 +#ifndef QPDF_NULL_HH
  2 +#define QPDF_NULL_HH
3 3  
4 4 #include <qpdf/QPDFObject.hh>
5 5  
... ... @@ -12,4 +12,4 @@ class QPDF_Null: public QPDFObject
12 12 virtual char const* getTypeName() const;
13 13 };
14 14  
15   -#endif // __QPDF_NULL_HH__
  15 +#endif // QPDF_NULL_HH
... ...
libqpdf/qpdf/QPDF_Operator.hh
1   -#ifndef __QPDF_OPERATOR_HH__
2   -#define __QPDF_OPERATOR_HH__
  1 +#ifndef QPDF_OPERATOR_HH
  2 +#define QPDF_OPERATOR_HH
3 3  
4 4 #include <qpdf/QPDFObject.hh>
5 5  
... ... @@ -17,4 +17,4 @@ class QPDF_Operator: public QPDFObject
17 17 std::string val;
18 18 };
19 19  
20   -#endif // __QPDF_OPERATOR_HH__
  20 +#endif // QPDF_OPERATOR_HH
... ...
libqpdf/qpdf/QPDF_Real.hh
1   -#ifndef __QPDF_REAL_HH__
2   -#define __QPDF_REAL_HH__
  1 +#ifndef QPDF_REAL_HH
  2 +#define QPDF_REAL_HH
3 3  
4 4 #include <qpdf/QPDFObject.hh>
5 5  
... ... @@ -19,4 +19,4 @@ class QPDF_Real: public QPDFObject
19 19 std::string val;
20 20 };
21 21  
22   -#endif // __QPDF_REAL_HH__
  22 +#endif // QPDF_REAL_HH
... ...
libqpdf/qpdf/QPDF_Reserved.hh
1   -#ifndef __QPDF_RESERVED_HH__
2   -#define __QPDF_RESERVED_HH__
  1 +#ifndef QPDF_RESERVED_HH
  2 +#define QPDF_RESERVED_HH
3 3  
4 4 #include <qpdf/QPDFObject.hh>
5 5  
... ... @@ -12,4 +12,4 @@ class QPDF_Reserved: public QPDFObject
12 12 virtual char const* getTypeName() const;
13 13 };
14 14  
15   -#endif // __QPDF_RESERVED_HH__
  15 +#endif // QPDF_RESERVED_HH
... ...
libqpdf/qpdf/QPDF_Stream.hh
1   -#ifndef __QPDF_STREAM_HH__
2   -#define __QPDF_STREAM_HH__
  1 +#ifndef QPDF_STREAM_HH
  2 +#define QPDF_STREAM_HH
3 3  
4 4 #include <qpdf/Types.h>
5 5  
... ... @@ -82,4 +82,4 @@ class QPDF_Stream: public QPDFObject
82 82 PointerHolder<QPDFObjectHandle::TokenFilter> > token_filters;
83 83 };
84 84  
85   -#endif // __QPDF_STREAM_HH__
  85 +#endif // QPDF_STREAM_HH
... ...
libqpdf/qpdf/QPDF_String.hh
1   -#ifndef __QPDF_STRING_HH__
2   -#define __QPDF_STRING_HH__
  1 +#ifndef QPDF_STRING_HH
  2 +#define QPDF_STRING_HH
3 3  
4 4 #include <qpdf/QPDFObject.hh>
5 5  
... ... @@ -22,4 +22,4 @@ class QPDF_String: public QPDFObject
22 22 std::string val;
23 23 };
24 24  
25   -#endif // __QPDF_STRING_HH__
  25 +#endif // QPDF_STRING_HH
... ...
libqpdf/qpdf/RC4.hh
1   -#ifndef __RC4_HH__
2   -#define __RC4_HH__
  1 +#ifndef RC4_HH
  2 +#define RC4_HH
3 3  
4 4 class RC4
5 5 {
... ... @@ -22,4 +22,4 @@ class RC4
22 22 RC4Key key;
23 23 };
24 24  
25   -#endif // __RC4_HH__
  25 +#endif // RC4_HH
... ...
libqpdf/qpdf/SecureRandomDataProvider.hh
1   -#ifndef __SECURERANDOMDATAPROVIDER_HH__
2   -#define __SECURERANDOMDATAPROVIDER_HH__
  1 +#ifndef SECURERANDOMDATAPROVIDER_HH
  2 +#define SECURERANDOMDATAPROVIDER_HH
3 3  
4 4 #include <qpdf/RandomDataProvider.hh>
5 5 #include <qpdf/DLL.h>
... ... @@ -19,4 +19,4 @@ class SecureRandomDataProvider: public RandomDataProvider
19 19 static RandomDataProvider* getInstance();
20 20 };
21 21  
22   -#endif // __SECURERANDOMDATAPROVIDER_HH__
  22 +#endif // SECURERANDOMDATAPROVIDER_HH
... ...
libqpdf/sph/sph_sha2.h
... ... @@ -37,8 +37,8 @@
37 37 * @author Thomas Pornin <thomas.pornin@cryptolog.com>
38 38 */
39 39  
40   -#ifndef SPH_SHA2_H__
41   -#define SPH_SHA2_H__
  40 +#ifndef SPH_SHA2_H
  41 +#define SPH_SHA2_H
42 42  
43 43 #ifdef __cplusplus
44 44 extern "C" {
... ...
libqpdf/sph/sph_types.h
... ... @@ -44,8 +44,8 @@
44 44 * @author Thomas Pornin <thomas.pornin@cryptolog.com>
45 45 */
46 46  
47   -#ifndef SPH_TYPES_H__
48   -#define SPH_TYPES_H__
  47 +#ifndef SPH_TYPES_H
  48 +#define SPH_TYPES_H
49 49  
50 50 #include <limits.h>
51 51  
... ...