aboutsummaryrefslogtreecommitdiffstats
path: root/libqpdf
diff options
context:
space:
mode:
authorJay Berkenbilt <ejb@ql.org>2018-08-12 20:07:22 +0200
committerJay Berkenbilt <ejb@ql.org>2018-08-12 20:10:32 +0200
commit3873f5fd9bd366c645eb221d0e75c0deaa2de24c (patch)
treefddebc65fed3f2492152e87da60e98f7bec644df /libqpdf
parent932799baab58df23cc1899720fd4637c4360d195 (diff)
downloadqpdf-3873f5fd9bd366c645eb221d0e75c0deaa2de24c.tar.zst
Protect headers with compliant identifiers (fixes #233)
Diffstat (limited to 'libqpdf')
-rw-r--r--libqpdf/qpdf/BitStream.hh6
-rw-r--r--libqpdf/qpdf/BitWriter.hh6
-rw-r--r--libqpdf/qpdf/ContentNormalizer.hh6
-rw-r--r--libqpdf/qpdf/InsecureRandomDataProvider.hh6
-rw-r--r--libqpdf/qpdf/MD5.hh6
-rw-r--r--libqpdf/qpdf/OffsetInputSource.hh6
-rw-r--r--libqpdf/qpdf/Pl_AES_PDF.hh6
-rw-r--r--libqpdf/qpdf/Pl_ASCII85Decoder.hh6
-rw-r--r--libqpdf/qpdf/Pl_ASCIIHexDecoder.hh6
-rw-r--r--libqpdf/qpdf/Pl_LZWDecoder.hh6
-rw-r--r--libqpdf/qpdf/Pl_MD5.hh6
-rw-r--r--libqpdf/qpdf/Pl_PNGFilter.hh6
-rw-r--r--libqpdf/qpdf/Pl_RC4.hh6
-rw-r--r--libqpdf/qpdf/Pl_SHA2.hh6
-rw-r--r--libqpdf/qpdf/Pl_TIFFPredictor.hh6
-rw-r--r--libqpdf/qpdf/QPDF_Array.hh6
-rw-r--r--libqpdf/qpdf/QPDF_Bool.hh6
-rw-r--r--libqpdf/qpdf/QPDF_Dictionary.hh6
-rw-r--r--libqpdf/qpdf/QPDF_InlineImage.hh6
-rw-r--r--libqpdf/qpdf/QPDF_Integer.hh6
-rw-r--r--libqpdf/qpdf/QPDF_Name.hh6
-rw-r--r--libqpdf/qpdf/QPDF_Null.hh6
-rw-r--r--libqpdf/qpdf/QPDF_Operator.hh6
-rw-r--r--libqpdf/qpdf/QPDF_Real.hh6
-rw-r--r--libqpdf/qpdf/QPDF_Reserved.hh6
-rw-r--r--libqpdf/qpdf/QPDF_Stream.hh6
-rw-r--r--libqpdf/qpdf/QPDF_String.hh6
-rw-r--r--libqpdf/qpdf/RC4.hh6
-rw-r--r--libqpdf/qpdf/SecureRandomDataProvider.hh6
-rw-r--r--libqpdf/sph/sph_sha2.h4
-rw-r--r--libqpdf/sph/sph_types.h4
31 files changed, 91 insertions, 91 deletions
diff --git a/libqpdf/qpdf/BitStream.hh b/libqpdf/qpdf/BitStream.hh
index 8ea8bec4..bdbf2645 100644
--- a/libqpdf/qpdf/BitStream.hh
+++ b/libqpdf/qpdf/BitStream.hh
@@ -1,7 +1,7 @@
// Read bits from a bit stream. See BitWriter for writing.
-#ifndef __BITSTREAM_HH__
-#define __BITSTREAM_HH__
+#ifndef BITSTREAM_HH
+#define BITSTREAM_HH
#include <qpdf/DLL.h>
@@ -28,4 +28,4 @@ class BitStream
unsigned int bits_available;
};
-#endif // __BITSTREAM_HH__
+#endif // BITSTREAM_HH
diff --git a/libqpdf/qpdf/BitWriter.hh b/libqpdf/qpdf/BitWriter.hh
index 3d93c0b7..76e28b8e 100644
--- a/libqpdf/qpdf/BitWriter.hh
+++ b/libqpdf/qpdf/BitWriter.hh
@@ -1,7 +1,7 @@
// Write bits into a bit stream. See BitStream for reading.
-#ifndef __BITWRITER_HH__
-#define __BITWRITER_HH__
+#ifndef BITWRITER_HH
+#define BITWRITER_HH
#include <qpdf/DLL.h>
@@ -28,4 +28,4 @@ class BitWriter
unsigned int bit_offset;
};
-#endif // __BITWRITER_HH__
+#endif // BITWRITER_HH
diff --git a/libqpdf/qpdf/ContentNormalizer.hh b/libqpdf/qpdf/ContentNormalizer.hh
index 0d505a37..4d976d27 100644
--- a/libqpdf/qpdf/ContentNormalizer.hh
+++ b/libqpdf/qpdf/ContentNormalizer.hh
@@ -1,5 +1,5 @@
-#ifndef __CONTENTNORMALIZER_HH__
-#define __CONTENTNORMALIZER_HH__
+#ifndef CONTENTNORMALIZER_HH
+#define CONTENTNORMALIZER_HH
#include <qpdf/QPDFObjectHandle.hh>
@@ -18,4 +18,4 @@ class ContentNormalizer: public QPDFObjectHandle::TokenFilter
bool last_token_was_bad;
};
-#endif // __CONTENTNORMALIZER_HH__
+#endif // CONTENTNORMALIZER_HH
diff --git a/libqpdf/qpdf/InsecureRandomDataProvider.hh b/libqpdf/qpdf/InsecureRandomDataProvider.hh
index 530ee3cb..76f2703a 100644
--- a/libqpdf/qpdf/InsecureRandomDataProvider.hh
+++ b/libqpdf/qpdf/InsecureRandomDataProvider.hh
@@ -1,5 +1,5 @@
-#ifndef __INSECURERANDOMDATAPROVIDER_HH__
-#define __INSECURERANDOMDATAPROVIDER_HH__
+#ifndef INSECURERANDOMDATAPROVIDER_HH
+#define INSECURERANDOMDATAPROVIDER_HH
#include <qpdf/RandomDataProvider.hh>
#include <qpdf/DLL.h>
@@ -24,4 +24,4 @@ class InsecureRandomDataProvider: public RandomDataProvider
bool seeded_random;
};
-#endif // __INSECURERANDOMDATAPROVIDER_HH__
+#endif // INSECURERANDOMDATAPROVIDER_HH
diff --git a/libqpdf/qpdf/MD5.hh b/libqpdf/qpdf/MD5.hh
index 4cfe027e..5cefe08c 100644
--- a/libqpdf/qpdf/MD5.hh
+++ b/libqpdf/qpdf/MD5.hh
@@ -1,5 +1,5 @@
-#ifndef __MD5_HH__
-#define __MD5_HH__
+#ifndef MD5_HH
+#define MD5_HH
#include <qpdf/DLL.h>
#include <qpdf/qpdf-config.h>
@@ -89,4 +89,4 @@ class MD5
Digest digest_val;
};
-#endif // __MD5_HH__
+#endif // MD5_HH
diff --git a/libqpdf/qpdf/OffsetInputSource.hh b/libqpdf/qpdf/OffsetInputSource.hh
index aedc574a..d541db1a 100644
--- a/libqpdf/qpdf/OffsetInputSource.hh
+++ b/libqpdf/qpdf/OffsetInputSource.hh
@@ -1,5 +1,5 @@
-#ifndef __QPDF_OFFSETINPUTSOURCE_HH__
-#define __QPDF_OFFSETINPUTSOURCE_HH__
+#ifndef QPDF_OFFSETINPUTSOURCE_HH
+#define QPDF_OFFSETINPUTSOURCE_HH
// This class implements an InputSource that proxies for an underlying
// input source but offset a specific number of bytes.
@@ -26,4 +26,4 @@ class OffsetInputSource: public InputSource
qpdf_offset_t global_offset;
};
-#endif // __QPDF_OFFSETINPUTSOURCE_HH__
+#endif // QPDF_OFFSETINPUTSOURCE_HH
diff --git a/libqpdf/qpdf/Pl_AES_PDF.hh b/libqpdf/qpdf/Pl_AES_PDF.hh
index 9aa73ad6..ac56e59a 100644
--- a/libqpdf/qpdf/Pl_AES_PDF.hh
+++ b/libqpdf/qpdf/Pl_AES_PDF.hh
@@ -1,5 +1,5 @@
-#ifndef __PL_AES_PDF_HH__
-#define __PL_AES_PDF_HH__
+#ifndef PL_AES_PDF_HH
+#define PL_AES_PDF_HH
#include <qpdf/Pipeline.hh>
#include <qpdf/qpdf-config.h>
@@ -66,4 +66,4 @@ class Pl_AES_PDF: public Pipeline
bool disable_padding;
};
-#endif // __PL_AES_PDF_HH__
+#endif // PL_AES_PDF_HH
diff --git a/libqpdf/qpdf/Pl_ASCII85Decoder.hh b/libqpdf/qpdf/Pl_ASCII85Decoder.hh
index 001da867..4778f61a 100644
--- a/libqpdf/qpdf/Pl_ASCII85Decoder.hh
+++ b/libqpdf/qpdf/Pl_ASCII85Decoder.hh
@@ -1,5 +1,5 @@
-#ifndef __PL_ASCII85DECODER_HH__
-#define __PL_ASCII85DECODER_HH__
+#ifndef PL_ASCII85DECODER_HH
+#define PL_ASCII85DECODER_HH
#include <qpdf/Pipeline.hh>
@@ -23,4 +23,4 @@ class Pl_ASCII85Decoder: public Pipeline
size_t eod;
};
-#endif // __PL_ASCII85DECODER_HH__
+#endif // PL_ASCII85DECODER_HH
diff --git a/libqpdf/qpdf/Pl_ASCIIHexDecoder.hh b/libqpdf/qpdf/Pl_ASCIIHexDecoder.hh
index 1d33afde..766fd727 100644
--- a/libqpdf/qpdf/Pl_ASCIIHexDecoder.hh
+++ b/libqpdf/qpdf/Pl_ASCIIHexDecoder.hh
@@ -1,5 +1,5 @@
-#ifndef __PL_ASCIIHEXDECODER_HH__
-#define __PL_ASCIIHEXDECODER_HH__
+#ifndef PL_ASCIIHEXDECODER_HH
+#define PL_ASCIIHEXDECODER_HH
#include <qpdf/Pipeline.hh>
@@ -23,4 +23,4 @@ class Pl_ASCIIHexDecoder: public Pipeline
bool eod;
};
-#endif // __PL_ASCIIHEXDECODER_HH__
+#endif // PL_ASCIIHEXDECODER_HH
diff --git a/libqpdf/qpdf/Pl_LZWDecoder.hh b/libqpdf/qpdf/Pl_LZWDecoder.hh
index 4121f6f2..b4f517ff 100644
--- a/libqpdf/qpdf/Pl_LZWDecoder.hh
+++ b/libqpdf/qpdf/Pl_LZWDecoder.hh
@@ -1,5 +1,5 @@
-#ifndef __PL_LZWDECODER_HH__
-#define __PL_LZWDECODER_HH__
+#ifndef PL_LZWDECODER_HH
+#define PL_LZWDECODER_HH
#include <qpdf/Pipeline.hh>
@@ -40,4 +40,4 @@ class Pl_LZWDecoder: public Pipeline
int last_code;
};
-#endif // __PL_LZWDECODER_HH__
+#endif // PL_LZWDECODER_HH
diff --git a/libqpdf/qpdf/Pl_MD5.hh b/libqpdf/qpdf/Pl_MD5.hh
index c23e6b45..08a93706 100644
--- a/libqpdf/qpdf/Pl_MD5.hh
+++ b/libqpdf/qpdf/Pl_MD5.hh
@@ -1,5 +1,5 @@
-#ifndef __PL_MD5_HH__
-#define __PL_MD5_HH__
+#ifndef PL_MD5_HH
+#define PL_MD5_HH
// This pipeline sends its output to its successor unmodified. After
// calling finish, the MD5 checksum of the data that passed through
@@ -45,4 +45,4 @@ class Pl_MD5: public Pipeline
bool persist_across_finish;
};
-#endif // __PL_MD5_HH__
+#endif // PL_MD5_HH
diff --git a/libqpdf/qpdf/Pl_PNGFilter.hh b/libqpdf/qpdf/Pl_PNGFilter.hh
index f167c67c..f6745319 100644
--- a/libqpdf/qpdf/Pl_PNGFilter.hh
+++ b/libqpdf/qpdf/Pl_PNGFilter.hh
@@ -1,5 +1,5 @@
-#ifndef __PL_PNGFILTER_HH__
-#define __PL_PNGFILTER_HH__
+#ifndef PL_PNGFILTER_HH
+#define PL_PNGFILTER_HH
// This pipeline applies or reverses the application of a PNG filter
// as described in the PNG specification.
@@ -49,4 +49,4 @@ class Pl_PNGFilter: public Pipeline
size_t incoming;
};
-#endif // __PL_PNGFILTER_HH__
+#endif // PL_PNGFILTER_HH
diff --git a/libqpdf/qpdf/Pl_RC4.hh b/libqpdf/qpdf/Pl_RC4.hh
index bb892f12..27eab5d0 100644
--- a/libqpdf/qpdf/Pl_RC4.hh
+++ b/libqpdf/qpdf/Pl_RC4.hh
@@ -1,5 +1,5 @@
-#ifndef __PL_RC4_HH__
-#define __PL_RC4_HH__
+#ifndef PL_RC4_HH
+#define PL_RC4_HH
#include <qpdf/Pipeline.hh>
@@ -29,4 +29,4 @@ class Pl_RC4: public Pipeline
RC4 rc4;
};
-#endif // __PL_RC4_HH__
+#endif // PL_RC4_HH
diff --git a/libqpdf/qpdf/Pl_SHA2.hh b/libqpdf/qpdf/Pl_SHA2.hh
index 8ff4723a..0748dd0b 100644
--- a/libqpdf/qpdf/Pl_SHA2.hh
+++ b/libqpdf/qpdf/Pl_SHA2.hh
@@ -1,5 +1,5 @@
-#ifndef __PL_SHA2_HH__
-#define __PL_SHA2_HH__
+#ifndef PL_SHA2_HH
+#define PL_SHA2_HH
// Bits must be a supported number of bits, currently only 256, 384,
// or 512. Passing 0 as bits leaves the pipeline uncommitted, in
@@ -47,4 +47,4 @@ class Pl_SHA2: public Pipeline
unsigned char sha512sum[64];
};
-#endif // __PL_SHA2_HH__
+#endif // PL_SHA2_HH
diff --git a/libqpdf/qpdf/Pl_TIFFPredictor.hh b/libqpdf/qpdf/Pl_TIFFPredictor.hh
index 235068ee..b4391f8e 100644
--- a/libqpdf/qpdf/Pl_TIFFPredictor.hh
+++ b/libqpdf/qpdf/Pl_TIFFPredictor.hh
@@ -1,5 +1,5 @@
-#ifndef __PL_TIFFPREDICTOR_HH__
-#define __PL_TIFFPREDICTOR_HH__
+#ifndef PL_TIFFPREDICTOR_HH
+#define PL_TIFFPREDICTOR_HH
// This pipeline reverses the application of a TIFF predictor as
// described in the TIFF specification.
@@ -36,4 +36,4 @@ class Pl_TIFFPredictor: public Pipeline
size_t pos;
};
-#endif // __PL_TIFFPREDICTOR_HH__
+#endif // PL_TIFFPREDICTOR_HH
diff --git a/libqpdf/qpdf/QPDF_Array.hh b/libqpdf/qpdf/QPDF_Array.hh
index 8a23da35..3681686f 100644
--- a/libqpdf/qpdf/QPDF_Array.hh
+++ b/libqpdf/qpdf/QPDF_Array.hh
@@ -1,5 +1,5 @@
-#ifndef __QPDF_ARRAY_HH__
-#define __QPDF_ARRAY_HH__
+#ifndef QPDF_ARRAY_HH
+#define QPDF_ARRAY_HH
#include <qpdf/QPDFObject.hh>
@@ -33,4 +33,4 @@ class QPDF_Array: public QPDFObject
std::vector<QPDFObjectHandle> items;
};
-#endif // __QPDF_ARRAY_HH__
+#endif // QPDF_ARRAY_HH
diff --git a/libqpdf/qpdf/QPDF_Bool.hh b/libqpdf/qpdf/QPDF_Bool.hh
index 2ec8eb10..72b4a509 100644
--- a/libqpdf/qpdf/QPDF_Bool.hh
+++ b/libqpdf/qpdf/QPDF_Bool.hh
@@ -1,5 +1,5 @@
-#ifndef __QPDF_BOOL_HH__
-#define __QPDF_BOOL_HH__
+#ifndef QPDF_BOOL_HH
+#define QPDF_BOOL_HH
#include <qpdf/QPDFObject.hh>
@@ -17,4 +17,4 @@ class QPDF_Bool: public QPDFObject
bool val;
};
-#endif // __QPDF_BOOL_HH__
+#endif // QPDF_BOOL_HH
diff --git a/libqpdf/qpdf/QPDF_Dictionary.hh b/libqpdf/qpdf/QPDF_Dictionary.hh
index cea63835..aa519fa5 100644
--- a/libqpdf/qpdf/QPDF_Dictionary.hh
+++ b/libqpdf/qpdf/QPDF_Dictionary.hh
@@ -1,5 +1,5 @@
-#ifndef __QPDF_DICTIONARY_HH__
-#define __QPDF_DICTIONARY_HH__
+#ifndef QPDF_DICTIONARY_HH
+#define QPDF_DICTIONARY_HH
#include <qpdf/QPDFObject.hh>
@@ -40,4 +40,4 @@ class QPDF_Dictionary: public QPDFObject
std::map<std::string, QPDFObjectHandle> items;
};
-#endif // __QPDF_DICTIONARY_HH__
+#endif // QPDF_DICTIONARY_HH
diff --git a/libqpdf/qpdf/QPDF_InlineImage.hh b/libqpdf/qpdf/QPDF_InlineImage.hh
index 6be034a9..f3a9269f 100644
--- a/libqpdf/qpdf/QPDF_InlineImage.hh
+++ b/libqpdf/qpdf/QPDF_InlineImage.hh
@@ -1,5 +1,5 @@
-#ifndef __QPDF_INLINEIMAGE_HH__
-#define __QPDF_INLINEIMAGE_HH__
+#ifndef QPDF_INLINEIMAGE_HH
+#define QPDF_INLINEIMAGE_HH
#include <qpdf/QPDFObject.hh>
@@ -17,4 +17,4 @@ class QPDF_InlineImage: public QPDFObject
std::string val;
};
-#endif // __QPDF_INLINEIMAGE_HH__
+#endif // QPDF_INLINEIMAGE_HH
diff --git a/libqpdf/qpdf/QPDF_Integer.hh b/libqpdf/qpdf/QPDF_Integer.hh
index 091392ab..b9459384 100644
--- a/libqpdf/qpdf/QPDF_Integer.hh
+++ b/libqpdf/qpdf/QPDF_Integer.hh
@@ -1,5 +1,5 @@
-#ifndef __QPDF_INTEGER_HH__
-#define __QPDF_INTEGER_HH__
+#ifndef QPDF_INTEGER_HH
+#define QPDF_INTEGER_HH
#include <qpdf/QPDFObject.hh>
@@ -17,4 +17,4 @@ class QPDF_Integer: public QPDFObject
long long val;
};
-#endif // __QPDF_INTEGER_HH__
+#endif // QPDF_INTEGER_HH
diff --git a/libqpdf/qpdf/QPDF_Name.hh b/libqpdf/qpdf/QPDF_Name.hh
index 5f50c41d..2f240fe5 100644
--- a/libqpdf/qpdf/QPDF_Name.hh
+++ b/libqpdf/qpdf/QPDF_Name.hh
@@ -1,5 +1,5 @@
-#ifndef __QPDF_NAME_HH__
-#define __QPDF_NAME_HH__
+#ifndef QPDF_NAME_HH
+#define QPDF_NAME_HH
#include <qpdf/QPDFObject.hh>
@@ -20,4 +20,4 @@ class QPDF_Name: public QPDFObject
std::string name;
};
-#endif // __QPDF_NAME_HH__
+#endif // QPDF_NAME_HH
diff --git a/libqpdf/qpdf/QPDF_Null.hh b/libqpdf/qpdf/QPDF_Null.hh
index 16ca4755..e55193c7 100644
--- a/libqpdf/qpdf/QPDF_Null.hh
+++ b/libqpdf/qpdf/QPDF_Null.hh
@@ -1,5 +1,5 @@
-#ifndef __QPDF_NULL_HH__
-#define __QPDF_NULL_HH__
+#ifndef QPDF_NULL_HH
+#define QPDF_NULL_HH
#include <qpdf/QPDFObject.hh>
@@ -12,4 +12,4 @@ class QPDF_Null: public QPDFObject
virtual char const* getTypeName() const;
};
-#endif // __QPDF_NULL_HH__
+#endif // QPDF_NULL_HH
diff --git a/libqpdf/qpdf/QPDF_Operator.hh b/libqpdf/qpdf/QPDF_Operator.hh
index 9d18ad37..4bf40066 100644
--- a/libqpdf/qpdf/QPDF_Operator.hh
+++ b/libqpdf/qpdf/QPDF_Operator.hh
@@ -1,5 +1,5 @@
-#ifndef __QPDF_OPERATOR_HH__
-#define __QPDF_OPERATOR_HH__
+#ifndef QPDF_OPERATOR_HH
+#define QPDF_OPERATOR_HH
#include <qpdf/QPDFObject.hh>
@@ -17,4 +17,4 @@ class QPDF_Operator: public QPDFObject
std::string val;
};
-#endif // __QPDF_OPERATOR_HH__
+#endif // QPDF_OPERATOR_HH
diff --git a/libqpdf/qpdf/QPDF_Real.hh b/libqpdf/qpdf/QPDF_Real.hh
index d59ed982..1a523dcf 100644
--- a/libqpdf/qpdf/QPDF_Real.hh
+++ b/libqpdf/qpdf/QPDF_Real.hh
@@ -1,5 +1,5 @@
-#ifndef __QPDF_REAL_HH__
-#define __QPDF_REAL_HH__
+#ifndef QPDF_REAL_HH
+#define QPDF_REAL_HH
#include <qpdf/QPDFObject.hh>
@@ -19,4 +19,4 @@ class QPDF_Real: public QPDFObject
std::string val;
};
-#endif // __QPDF_REAL_HH__
+#endif // QPDF_REAL_HH
diff --git a/libqpdf/qpdf/QPDF_Reserved.hh b/libqpdf/qpdf/QPDF_Reserved.hh
index 8dbf4fe4..8062abb1 100644
--- a/libqpdf/qpdf/QPDF_Reserved.hh
+++ b/libqpdf/qpdf/QPDF_Reserved.hh
@@ -1,5 +1,5 @@
-#ifndef __QPDF_RESERVED_HH__
-#define __QPDF_RESERVED_HH__
+#ifndef QPDF_RESERVED_HH
+#define QPDF_RESERVED_HH
#include <qpdf/QPDFObject.hh>
@@ -12,4 +12,4 @@ class QPDF_Reserved: public QPDFObject
virtual char const* getTypeName() const;
};
-#endif // __QPDF_RESERVED_HH__
+#endif // QPDF_RESERVED_HH
diff --git a/libqpdf/qpdf/QPDF_Stream.hh b/libqpdf/qpdf/QPDF_Stream.hh
index 98b8c11f..7af2ffc2 100644
--- a/libqpdf/qpdf/QPDF_Stream.hh
+++ b/libqpdf/qpdf/QPDF_Stream.hh
@@ -1,5 +1,5 @@
-#ifndef __QPDF_STREAM_HH__
-#define __QPDF_STREAM_HH__
+#ifndef QPDF_STREAM_HH
+#define QPDF_STREAM_HH
#include <qpdf/Types.h>
@@ -82,4 +82,4 @@ class QPDF_Stream: public QPDFObject
PointerHolder<QPDFObjectHandle::TokenFilter> > token_filters;
};
-#endif // __QPDF_STREAM_HH__
+#endif // QPDF_STREAM_HH
diff --git a/libqpdf/qpdf/QPDF_String.hh b/libqpdf/qpdf/QPDF_String.hh
index b4858c49..377b0900 100644
--- a/libqpdf/qpdf/QPDF_String.hh
+++ b/libqpdf/qpdf/QPDF_String.hh
@@ -1,5 +1,5 @@
-#ifndef __QPDF_STRING_HH__
-#define __QPDF_STRING_HH__
+#ifndef QPDF_STRING_HH
+#define QPDF_STRING_HH
#include <qpdf/QPDFObject.hh>
@@ -22,4 +22,4 @@ class QPDF_String: public QPDFObject
std::string val;
};
-#endif // __QPDF_STRING_HH__
+#endif // QPDF_STRING_HH
diff --git a/libqpdf/qpdf/RC4.hh b/libqpdf/qpdf/RC4.hh
index c26f3d0f..efd91069 100644
--- a/libqpdf/qpdf/RC4.hh
+++ b/libqpdf/qpdf/RC4.hh
@@ -1,5 +1,5 @@
-#ifndef __RC4_HH__
-#define __RC4_HH__
+#ifndef RC4_HH
+#define RC4_HH
class RC4
{
@@ -22,4 +22,4 @@ class RC4
RC4Key key;
};
-#endif // __RC4_HH__
+#endif // RC4_HH
diff --git a/libqpdf/qpdf/SecureRandomDataProvider.hh b/libqpdf/qpdf/SecureRandomDataProvider.hh
index 178c73c0..3f5ed19f 100644
--- a/libqpdf/qpdf/SecureRandomDataProvider.hh
+++ b/libqpdf/qpdf/SecureRandomDataProvider.hh
@@ -1,5 +1,5 @@
-#ifndef __SECURERANDOMDATAPROVIDER_HH__
-#define __SECURERANDOMDATAPROVIDER_HH__
+#ifndef SECURERANDOMDATAPROVIDER_HH
+#define SECURERANDOMDATAPROVIDER_HH
#include <qpdf/RandomDataProvider.hh>
#include <qpdf/DLL.h>
@@ -19,4 +19,4 @@ class SecureRandomDataProvider: public RandomDataProvider
static RandomDataProvider* getInstance();
};
-#endif // __SECURERANDOMDATAPROVIDER_HH__
+#endif // SECURERANDOMDATAPROVIDER_HH
diff --git a/libqpdf/sph/sph_sha2.h b/libqpdf/sph/sph_sha2.h
index 4bff9cd8..dde62088 100644
--- a/libqpdf/sph/sph_sha2.h
+++ b/libqpdf/sph/sph_sha2.h
@@ -37,8 +37,8 @@
* @author Thomas Pornin <thomas.pornin@cryptolog.com>
*/
-#ifndef SPH_SHA2_H__
-#define SPH_SHA2_H__
+#ifndef SPH_SHA2_H
+#define SPH_SHA2_H
#ifdef __cplusplus
extern "C" {
diff --git a/libqpdf/sph/sph_types.h b/libqpdf/sph/sph_types.h
index eab09a26..f434d8bb 100644
--- a/libqpdf/sph/sph_types.h
+++ b/libqpdf/sph/sph_types.h
@@ -44,8 +44,8 @@
* @author Thomas Pornin <thomas.pornin@cryptolog.com>
*/
-#ifndef SPH_TYPES_H__
-#define SPH_TYPES_H__
+#ifndef SPH_TYPES_H
+#define SPH_TYPES_H
#include <limits.h>