2010-10-31 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Made #include guard consistent for c++ header files.

ChangeLog

@@ -1,3 +1,7 @@
+2010-10-31  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Made #include guard consistent for c++ header files.
+
 2010-10-31  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Fixed the bug that downloading > 4GB file fails on 32bit systems.

src/A2STR.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_A2_STR_H_
-#define _D_A2_STR_H_
+#ifndef D_A2_STR_H
+#define D_A2_STR_H
 
 #include <string>
 
@@ -71,4 +71,4 @@ public:
 };
 } // namespace aria2
 
-#endif // _D_A2_STR_H_
+#endif // D_A2_STR_H

src/ARC4Decryptor.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ARC4_DECRYPTOR_H_
-#define _D_ARC4_DECRYPTOR_H_
+#ifndef D_ARC4_DECRYPTOR_H
+#define D_ARC4_DECRYPTOR_H
 
 #include "common.h"
 #ifdef HAVE_LIBGCRYPT
@@ -62,4 +62,4 @@ public:
 
 #endif
 
-#endif // _D_ARC4_DECRYPTOR_H_
+#endif // D_ARC4_DECRYPTOR_H

src/ARC4Encryptor.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ARC4_ENCRYPTOR_H_
-#define _D_ARC4_ENCRYPTOR_H_
+#ifndef D_ARC4_ENCRYPTOR_H
+#define D_ARC4_ENCRYPTOR_H
 
 #include "common.h"
 #ifdef HAVE_LIBGCRYPT
@@ -62,4 +62,4 @@ public:
 
 #endif
 
-#endif // _D_ARC4_ENCRYPTOR_H_
+#endif // D_ARC4_ENCRYPTOR_H

src/AbstractAuthResolver.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ABSTRACT_AUTH_RESOLVER_H_
-#define _D_ABSTRACT_AUTH_RESOLVER_H_
+#ifndef D_ABSTRACT_AUTH_RESOLVER_H
+#define D_ABSTRACT_AUTH_RESOLVER_H
 
 #include "AuthResolver.h"
 
@@ -69,4 +69,4 @@ typedef SharedHandle<AbstractAuthResolver> AbstractAuthResolverHandle;
 
 } // namespace aria2
 
-#endif // _D_ABSTRACT_AUTH_RESOLVER_H_
+#endif // D_ABSTRACT_AUTH_RESOLVER_H

src/AbstractBtMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ABSTRACT_BT_MESSAGE_H_
-#define _D_ABSTRACT_BT_MESSAGE_H_
+#ifndef D_ABSTRACT_BT_MESSAGE_H
+#define D_ABSTRACT_BT_MESSAGE_H
 
 #include "BtMessage.h"
 #include "Command.h"
@@ -196,4 +196,4 @@ typedef SharedHandle<AbstractBtMessage> AbstractBtMessageHandle;
 
 } // namespace aria2
 
-#endif // _D_ABSTRACT_BT_MESSAGE_H_
+#endif // D_ABSTRACT_BT_MESSAGE_H

src/AbstractCommand.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ABSTRACT_COMMAND_H_
-#define _D_ABSTRACT_COMMAND_H_
+#ifndef D_ABSTRACT_COMMAND_H
+#define D_ABSTRACT_COMMAND_H
 
 #include "Command.h"
 #include "SharedHandle.h"
@@ -246,4 +246,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_ABSTRACT_COMMAND_H_
+#endif // D_ABSTRACT_COMMAND_H

src/AbstractDiskWriter.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ABSTRACT_DISK_WRITER_H_
-#define _D_ABSTRACT_DISK_WRITER_H_
+#ifndef D_ABSTRACT_DISK_WRITER_H
+#define D_ABSTRACT_DISK_WRITER_H
 
 #include "DiskWriter.h"
 #include <string>
@@ -93,4 +93,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_ABSTRACT_DISK_WRITER_H_
+#endif // D_ABSTRACT_DISK_WRITER_H

src/AbstractProxyRequestCommand.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ABSTRACT_PROXY_REQUEST_COMMAND_H_
-#define _D_ABSTRACT_PROXY_REQUEST_COMMAND_H_
+#ifndef D_ABSTRACT_PROXY_REQUEST_COMMAND_H
+#define D_ABSTRACT_PROXY_REQUEST_COMMAND_H
 
 #include "AbstractCommand.h"
 
@@ -70,4 +70,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_ABSTRACT_PROXY_REQUEST_COMMAND_H_
+#endif // D_ABSTRACT_PROXY_REQUEST_COMMAND_H

src/AbstractProxyResponseCommand.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ABSTRACT_PROXY_RESPONSE_COMMAND_H_
-#define _D_ABSTRACT_PROXY_RESPONSE_COMMAND_H_
+#ifndef D_ABSTRACT_PROXY_RESPONSE_COMMAND_H
+#define D_ABSTRACT_PROXY_RESPONSE_COMMAND_H
 
 #include "AbstractCommand.h"
 
@@ -69,4 +69,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_ABSTRACT_PROXY_RESPONSE_COMMAND_H_
+#endif // D_ABSTRACT_PROXY_RESPONSE_COMMAND_H

src/AbstractSingleDiskAdaptor.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ABSTRACT_SINGLE_DISK_ADAPTOR_H_
-#define _D_ABSTRACT_SINGLE_DISK_ADAPTOR_H_
+#ifndef D_ABSTRACT_SINGLE_DISK_ADAPTOR_H
+#define D_ABSTRACT_SINGLE_DISK_ADAPTOR_H
 
 #include "DiskAdaptor.h"
 
@@ -106,4 +106,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_ABSTRACT_SINGLE_DISK_ADAPTOR_H_
+#endif // D_ABSTRACT_SINGLE_DISK_ADAPTOR_H

src/ActivePeerConnectionCommand.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ACTIVE_PEER_CONNECTION_COMMAND_H_
-#define _D_ACTIVE_PEER_CONNECTION_COMMAND_H_
+#ifndef D_ACTIVE_PEER_CONNECTION_COMMAND_H
+#define D_ACTIVE_PEER_CONNECTION_COMMAND_H
 
 #include "Command.h"
 #include "SharedHandle.h"
@@ -89,4 +89,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_ACTIVE_PEER_CONNECTION_COMMAND_H_
+#endif // D_ACTIVE_PEER_CONNECTION_COMMAND_H

src/AdaptiveURISelector.h

@@ -33,8 +33,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ADAPTIVE_URI_SELECTOR_H_
-#define _D_ADAPTIVE_URI_SELECTOR_H_
+#ifndef D_ADAPTIVE_URI_SELECTOR_H
+#define D_ADAPTIVE_URI_SELECTOR_H
 #include "URISelector.h"
 #include "SharedHandle.h"
 
@@ -89,4 +89,4 @@ public:
 };
 
 } // namespace aria2
-#endif // _D_ADAPTIVE_URI_SELECTOR_H_
+#endif // D_ADAPTIVE_URI_SELECTOR_H

src/AlphaNumberDecorator.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ALPHA_NUMBER_DECORATOR_H_
-#define _D_ALPHA_NUMBER_DECORATOR_H_
+#ifndef D_ALPHA_NUMBER_DECORATOR_H
+#define D_ALPHA_NUMBER_DECORATOR_H
 
 #include "NumberDecorator.h"
 #include "DlAbortEx.h"
@@ -88,4 +88,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_ALPHA_NUMBER_DECORATOR_H_
+#endif // D_ALPHA_NUMBER_DECORATOR_H

src/AnnounceList.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ANNOUNCE_LIST_H_
-#define _D_ANNOUNCE_LIST_H_
+#ifndef D_ANNOUNCE_LIST_H
+#define D_ANNOUNCE_LIST_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -137,4 +137,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_ANNOUNCE_LIST_H_
+#endif // D_ANNOUNCE_LIST_H

src/AnnounceTier.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ANNOUNCE_TIER_H_
-#define _D_ANNOUNCE_TIER_H_
+#ifndef D_ANNOUNCE_TIER_H
+#define D_ANNOUNCE_TIER_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -95,4 +95,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_ANNOUNCE_TIER_H_
+#endif // D_ANNOUNCE_TIER_H

src/AsyncNameResolver.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ASYNC_NAME_RESOLVER_H_
-#define _D_ASYNC_NAME_RESOLVER_H_
+#ifndef D_ASYNC_NAME_RESOLVER_H
+#define D_ASYNC_NAME_RESOLVER_H
 
 #include "common.h"
 
@@ -118,4 +118,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_ASYNC_NAME_RESOLVER_H_
+#endif // D_ASYNC_NAME_RESOLVER_H

src/AuthConfig.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_AUTH_CONFIG_H_
-#define _D_AUTH_CONFIG_H_
+#ifndef D_AUTH_CONFIG_H
+#define D_AUTH_CONFIG_H
 
 #include "common.h"
 
@@ -78,4 +78,4 @@ std::ostream& operator<<(std::ostream& o, const AuthConfigHandle& authConfig);
 
 } // namespace aria2
 
-#endif // _D_AUTH_CONFIG_H_
+#endif // D_AUTH_CONFIG_H

src/AuthConfigFactory.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_AUTH_CONFIG_FACTORY_H_
-#define _D_AUTH_CONFIG_FACTORY_H_
+#ifndef D_AUTH_CONFIG_FACTORY_H
+#define D_AUTH_CONFIG_FACTORY_H
 
 #include "common.h"
 
@@ -127,4 +127,4 @@ typedef SharedHandle<AuthConfigFactory> AuthConfigFactoryHandle;
 
 } // namespace aria2
 
-#endif // _D_AUTH_CONFIG_FACTORY_H_
+#endif // D_AUTH_CONFIG_FACTORY_H

src/AuthResolver.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_AUTH_RESOLVER_H_
-#define _D_AUTH_RESOLVER_H_
+#ifndef D_AUTH_RESOLVER_H
+#define D_AUTH_RESOLVER_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -54,4 +54,4 @@ typedef SharedHandle<AuthResolver> AuthResolverHandle;
 
 } // namespace aria2
 
-#endif // _D_AUTH_RESOLVER_H_
+#endif // D_AUTH_RESOLVER_H

src/AutoSaveCommand.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_AUTO_SAVE_COMMAND_H_
-#define _D_AUTO_SAVE_COMMAND_H_
+#ifndef D_AUTO_SAVE_COMMAND_H
+#define D_AUTO_SAVE_COMMAND_H
 
 #include "TimeBasedCommand.h"
 
@@ -53,4 +53,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_AUTO_SAVE_COMMAND_H_
+#endif // D_AUTO_SAVE_COMMAND_H

src/BNode.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BNODE_H_
-#define _D_BNODE_H_
+#ifndef D_BNODE_H
+#define D_BNODE_H
 
 #include "common.h"
 
@@ -104,4 +104,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BNODE_H_
+#endif // D_BNODE_H

src/Base64.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BASE64_H_
-#define _D_BASE64_H_
+#ifndef D_BASE64_H
+#define D_BASE64_H
 #include <string>
 
 namespace aria2 {
@@ -94,4 +94,4 @@ public:
 
 } // namespace aria2
 
-#endif // _BASE64_H_
+#endif // D_BASE64_H

src/BinaryStream.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BINARY_STREAM_H_
-#define _D_BINARY_STREAM_H_
+#ifndef D_BINARY_STREAM_H
+#define D_BINARY_STREAM_H
 
 #include "common.h"
 
@@ -68,4 +68,4 @@ typedef SharedHandle<BinaryStream> BinaryStreamHandle;
 
 } // namespace aria2
 
-#endif // _D_BINARY_STREAM_H_
+#endif // D_BINARY_STREAM_H

src/BitfieldMan.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BITFIELD_MAN_H_
-#define _D_BITFIELD_MAN_H_
+#ifndef D_BITFIELD_MAN_H
+#define D_BITFIELD_MAN_H
 
 #include "common.h"
 
@@ -282,4 +282,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BITFIELD_MAN_H_
+#endif // D_BITFIELD_MAN_H

src/BtAbortOutstandingRequestEvent.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_ABORT_OUTSTANDING_REQUEST_EVENT_H_
-#define _D_BT_ABORT_OUTSTANDING_REQUEST_EVENT_H_
+#ifndef D_BT_ABORT_OUTSTANDING_REQUEST_EVENT_H
+#define D_BT_ABORT_OUTSTANDING_REQUEST_EVENT_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -53,4 +53,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_ABORT_OUTSTANDING_REQUEST_EVENT_H_
+#endif // D_BT_ABORT_OUTSTANDING_REQUEST_EVENT_H

src/BtAllowedFastMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_ALLOWED_FAST_MESSAGE_H_
-#define _D_BT_ALLOWED_FAST_MESSAGE_H_
+#ifndef D_BT_ALLOWED_FAST_MESSAGE_H
+#define D_BT_ALLOWED_FAST_MESSAGE_H
 
 #include "IndexBtMessage.h"
 
@@ -62,4 +62,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_ALLOWED_FAST_MESSAGE_H_
+#endif // D_BT_ALLOWED_FAST_MESSAGE_H

src/BtAnnounce.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_ANNOUNCE_H_
-#define _D_BT_ANNOUNCE_H_
+#ifndef D_BT_ANNOUNCE_H
+#define D_BT_ANNOUNCE_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -132,4 +132,4 @@ typedef SharedHandle<BtAnnounce> BtAnnounceHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_ANNOUNCE_H_
+#endif // D_BT_ANNOUNCE_H

src/BtBitfieldMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_BITFIELD_MESSAGE_H_
-#define _D_BT_BITFIELD_MESSAGE_H_
+#ifndef D_BT_BITFIELD_MESSAGE_H
+#define D_BT_BITFIELD_MESSAGE_H
 
 #include "SimpleBtMessage.h"
 
@@ -78,4 +78,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_BITFIELD_MESSAGE_H_
+#endif // D_BT_BITFIELD_MESSAGE_H

src/BtBitfieldMessageValidator.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_BITFIELD_MESSAGE_VALIDATOR_H_
-#define _D_BT_BITFIELD_MESSAGE_VALIDATOR_H_
+#ifndef D_BT_BITFIELD_MESSAGE_VALIDATOR_H
+#define D_BT_BITFIELD_MESSAGE_VALIDATOR_H
 
 #include "BtMessageValidator.h"
 #include "BtBitfieldMessage.h"
@@ -63,4 +63,4 @@ typedef SharedHandle<BtBitfieldMessageValidator> BtBitfieldMessageValidatorHandl
 
 } // namespace aria2
 
-#endif // _D_BT_BITFIELD_MESSAGE_VALIDATOR_H_
+#endif // D_BT_BITFIELD_MESSAGE_VALIDATOR_H

src/BtCancelMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_CANCEL_MESSAGE_H_
-#define _D_BT_CANCEL_MESSAGE_H_
+#ifndef D_BT_CANCEL_MESSAGE_H
+#define D_BT_CANCEL_MESSAGE_H
 
 #include "RangeBtMessage.h"
 
@@ -59,4 +59,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_CANCEL_MESSAGE_H_
+#endif // D_BT_CANCEL_MESSAGE_H

src/BtCancelSendingPieceEvent.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_CANCEL_SENDING_PIECE_EVENT_H_
-#define _D_BT_CANCEL_SENDING_PIECE_EVENT_H_
+#ifndef D_BT_CANCEL_SENDING_PIECE_EVENT_H
+#define D_BT_CANCEL_SENDING_PIECE_EVENT_H
 
 #include "common.h"
 
@@ -57,4 +57,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_CANCEL_SENDING_PIECE_EVENT_H_
+#endif // D_BT_CANCEL_SENDING_PIECE_EVENT_H

src/BtCheckIntegrityEntry.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_CHECK_INTEGRITY_ENTRY_H_
-#define _D_BT_CHECK_INTEGRITY_ENTRY_H_
+#ifndef D_BT_CHECK_INTEGRITY_ENTRY_H
+#define D_BT_CHECK_INTEGRITY_ENTRY_H
 
 #include "PieceHashCheckIntegrityEntry.h"
 
@@ -56,4 +56,4 @@ typedef SharedHandle<BtCheckIntegrityEntry> BtCheckIntegrityEntryHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_FILE_ALLOCATION_ENTRY_H_
+#endif // D_BT_FILE_ALLOCATION_ENTRY_H

src/BtChokeMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_CHOKE_MESSAGE_H_
-#define _D_BT_CHOKE_MESSAGE_H_
+#ifndef D_BT_CHOKE_MESSAGE_H
+#define D_BT_CHOKE_MESSAGE_H
 
 #include "ZeroBtMessage.h"
 
@@ -63,4 +63,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_CHOKE_MESSAGE_H_
+#endif // D_CHOKE_MESSAGE_H

src/BtChokingEvent.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_CHOKING_EVENT_H_
-#define _D_BT_CHOKING_EVENT_H_
+#ifndef D_BT_CHOKING_EVENT_H
+#define D_BT_CHOKING_EVENT_H
 
 #include "common.h"
 
@@ -43,4 +43,4 @@ class BtChokingEvent {};
 
 } // namespace aria2
 
-#endif // _D_BT_CHOKING_EVENT_H_
+#endif // D_BT_CHOKING_EVENT_H

src/BtConstants.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_CONSTANTS_
-#define _D_BT_CONSTANTS_
+#ifndef D_BT_CONSTANTS_H
+#define D_BT_CONSTANTS_H
 
 #include "common.h"
 #include <map>
@@ -68,4 +68,4 @@ typedef std::map<std::string, uint8_t> Extensions;
 
 #define COMPACT_LEN_IPV6 18
 
-#endif // _D_BT_CONSTANTS_
+#endif // D_BT_CONSTANTS_H

src/BtDependency.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_DEPENDENCY_H_
-#define _D_BT_DEPENDENCY_H_
+#ifndef D_BT_DEPENDENCY_H
+#define D_BT_DEPENDENCY_H
 
 #include "Dependency.h"
 
@@ -62,4 +62,4 @@ typedef SharedHandle<BtDependency> BtDependencyHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_DEPENDENCY_H_
+#endif // D_BT_DEPENDENCY_H

src/BtExtendedMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_EXTENDED_MESSAGE_H_
-#define _D_BT_EXTENDED_MESSAGE_H_
+#ifndef D_BT_EXTENDED_MESSAGE_H
+#define D_BT_EXTENDED_MESSAGE_H
 #include "SimpleBtMessage.h"
 
 namespace aria2 {
@@ -83,4 +83,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_EXTENDED_MESSAGE_H_
+#endif // D_BT_EXTENDED_MESSAGE_H

src/BtFileAllocationEntry.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_FILE_ALLOCATION_ENTRY_H_
-#define _D_BT_FILE_ALLOCATION_ENTRY_H_
+#ifndef D_BT_FILE_ALLOCATION_ENTRY_H
+#define D_BT_FILE_ALLOCATION_ENTRY_H
 
 #include "FileAllocationEntry.h"
 
@@ -53,4 +53,4 @@ typedef SharedHandle<BtFileAllocationEntry> BtFileAllocationEntryHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_FILE_ALLOCATION_ENTRY_H_
+#endif // D_BT_FILE_ALLOCATION_ENTRY_H

src/BtHandshakeMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_HANDSHAKE_MESSAGE_H_
-#define _D_BT_HANDSHAKE_MESSAGE_H_
+#ifndef D_BT_HANDSHAKE_MESSAGE_H
+#define D_BT_HANDSHAKE_MESSAGE_H
 
 #include "SimpleBtMessage.h"
 
@@ -124,4 +124,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_HANDSHAKE_MESSAGE_H_
+#endif // D_HANDSHAKE_MESSAGE_H

src/BtHandshakeMessageValidator.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_HANDSHAKE_MESSAGE_VALIDATOR_H_
-#define _D_BT_HANDSHAKE_MESSAGE_VALIDATOR_H_
+#ifndef D_BT_HANDSHAKE_MESSAGE_VALIDATOR_H
+#define D_BT_HANDSHAKE_MESSAGE_VALIDATOR_H
 
 #include "BtMessageValidator.h"
 
@@ -84,4 +84,4 @@ typedef SharedHandle<BtHandshakeMessageValidator> BtHandshakeMessageValidatorHan
 
 } // namespace aria2
 
-#endif // _D_BT_HANDSHAKE_MESSAGE_VALIDATOR_H_
+#endif // D_BT_HANDSHAKE_MESSAGE_VALIDATOR_H

src/BtHaveAllMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_HAVE_ALL_MESSAGE_H_
-#define _D_BT_HAVE_ALL_MESSAGE_H_
+#ifndef D_BT_HAVE_ALL_MESSAGE_H
+#define D_BT_HAVE_ALL_MESSAGE_H
 
 #include "ZeroBtMessage.h"
 
@@ -59,4 +59,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_HAVE_ALL_MESSAGE_H_
+#endif // D_BT_HAVE_ALL_MESSAGE_H

src/BtHaveMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_HAVE_MESSAGE_H_
-#define _D_BT_HAVE_MESSAGE_H_
+#ifndef D_BT_HAVE_MESSAGE_H
+#define D_BT_HAVE_MESSAGE_H
 
 #include "IndexBtMessage.h"
 
@@ -59,4 +59,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_HAVE_MESSAGE_H_
+#endif // D_BT_HAVE_MESSAGE_H

src/BtHaveNoneMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_HAVE_NONE_MESSAGE_H_
-#define _D_BT_HAVE_NONE_MESSAGE_H_
+#ifndef D_BT_HAVE_NONE_MESSAGE_H
+#define D_BT_HAVE_NONE_MESSAGE_H
 
 #include "ZeroBtMessage.h"
 
@@ -59,4 +59,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_HAVE_NONE_MESSAGE_H_
+#endif // D_BT_HAVE_NONE_MESSAGE_H

src/BtInteractive.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_INTERACTIVE_H_
-#define _D_BT_INTERACTIVE_H_
+#ifndef D_BT_INTERACTIVE_H
+#define D_BT_INTERACTIVE_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -73,4 +73,4 @@ typedef SharedHandle<BtInteractive> BtInteractiveHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_INTERACTIVE_H_
+#endif // D_BT_INTERACTIVE_H

src/BtInterestedMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_INTERESTED_MESSAGE_H_
-#define _D_BT_INTERESTED_MESSAGE_H_
+#ifndef D_BT_INTERESTED_MESSAGE_H
+#define D_BT_INTERESTED_MESSAGE_H
 
 #include "ZeroBtMessage.h"
 
@@ -68,4 +68,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_INTERESTED_MESSAGE_H_
+#endif // D_BT_INTERESTED_MESSAGE_H

src/BtKeepAliveMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_KEEP_ALIVE_MESSAGE_H_
-#define _D_BT_KEEP_ALIVE_MESSAGE_H_
+#ifndef D_BT_KEEP_ALIVE_MESSAGE_H
+#define D_BT_KEEP_ALIVE_MESSAGE_H
 
 #include "SimpleBtMessage.h"
 
@@ -67,4 +67,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_KEEP_ALIVE_MESSAGE_H_
+#endif // D_BT_KEEP_ALIVE_MESSAGE_H

src/BtLeecherStateChoke.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_LEECHER_STATE_CHOKE_H_
-#define _D_BT_LEECHER_STATE_CHOKE_H_
+#ifndef D_BT_LEECHER_STATE_CHOKE_H
+#define D_BT_LEECHER_STATE_CHOKE_H
 
 #include "common.h"
 
@@ -117,4 +117,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_LEECHER_STATE_CHOKE_H_
+#endif // D_BT_LEECHER_STATE_CHOKE_H

src/BtMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_MESSAGE_H_
-#define _D_BT_MESSAGE_H_
+#ifndef D_BT_MESSAGE_H
+#define D_BT_MESSAGE_H
 
 #include "common.h"
 
@@ -88,4 +88,4 @@ typedef SharedHandle<BtMessage> BtMessageHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_MESSAGE_H_
+#endif // D_BT_MESSAGE_H

src/BtMessageDispatcher.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_MESSAGE_DISPATCHER_H_
-#define _D_BT_MESSAGE_DISPATCHER_H_
+#ifndef D_BT_MESSAGE_DISPATCHER_H
+#define D_BT_MESSAGE_DISPATCHER_H
 
 #include "common.h"
 
@@ -92,4 +92,4 @@ typedef WeakHandle<BtMessageDispatcher> BtMessageDispatcherWeakHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_MESSAGE_DISPATCHER_H_
+#endif // D_BT_MESSAGE_DISPATCHER_H

src/BtMessageFactory.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_MESSAGE_FACTORY_H_
-#define _D_BT_MESSAGE_FACTORY_H_
+#ifndef D_BT_MESSAGE_FACTORY_H
+#define D_BT_MESSAGE_FACTORY_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -102,4 +102,4 @@ typedef WeakHandle<BtMessageFactory> BtMessageFactoryWeakHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_MESSAGE_FACTORY_H_
+#endif // D_BT_MESSAGE_FACTORY_H

src/BtMessageReceiver.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_MESSAGE_RECEIVER_H_
-#define _D_BT_MESSAGE_RECEIVER_H_
+#ifndef D_BT_MESSAGE_RECEIVER_H
+#define D_BT_MESSAGE_RECEIVER_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -59,4 +59,4 @@ typedef WeakHandle<BtMessageReceiver> BtMessageReceiverWeakHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_MESSAGE_RECEIVER_H_
+#endif // D_BT_MESSAGE_RECEIVER_H

src/BtMessageValidator.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_MESSAGE_VALIDATOR_H_
-#define _D_BT_MESSAGE_VALIDATOR_H_
+#ifndef D_BT_MESSAGE_VALIDATOR_H
+#define D_BT_MESSAGE_VALIDATOR_H
 
 #include "common.h"
 
@@ -55,4 +55,4 @@ typedef SharedHandle<BtMessageValidator> BtMessageValidatorHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_MESSAGE_VALIDATOR_H_
+#endif // D_BT_MESSAGE_VALIDATOR_H

src/BtNotInterestedMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_NOT_INTERESTED_MESSAGE_H_
-#define _D_BT_NOT_INTERESTED_MESSAGE_H_
+#ifndef D_BT_NOT_INTERESTED_MESSAGE_H
+#define D_BT_NOT_INTERESTED_MESSAGE_H
 
 #include "ZeroBtMessage.h"
 
@@ -68,4 +68,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_NOT_INTERESTED_MESSAGE_H_
+#endif // D_BT_NOT_INTERESTED_MESSAGE_H

src/BtPieceMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_PIECE_MESSAGE_H_
-#define _D_BT_PIECE_MESSAGE_H_
+#ifndef D_BT_PIECE_MESSAGE_H
+#define D_BT_PIECE_MESSAGE_H
 
 #include "AbstractBtMessage.h"
 
@@ -116,4 +116,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_PIECE_MESSAGE_H_
+#endif // D_BT_PIECE_MESSAGE_H

src/BtPieceMessageValidator.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_PIECE_MESSAGE_VALIDATOR_H_
-#define _D_BT_PIECE_MESSAGE_VALIDATOR_H_
+#ifndef D_BT_PIECE_MESSAGE_VALIDATOR_H
+#define D_BT_PIECE_MESSAGE_VALIDATOR_H
 
 #include "BtMessageValidator.h"
 #include "BtPieceMessage.h"
@@ -65,4 +65,4 @@ typedef SharedHandle<BtPieceMessageValidator> BtPieceMessageValidatorHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_PIECE_MESSAGE_VALIDATOR_H_
+#endif // D_BT_PIECE_MESSAGE_VALIDATOR_H

src/BtPortMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_PORT_MESSAGE_H_
-#define _D_BT_PORT_MESSAGE_H_
+#ifndef D_BT_PORT_MESSAGE_H
+#define D_BT_PORT_MESSAGE_H
 
 #include "SimpleBtMessage.h"
 
@@ -87,4 +87,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_PORT_MESSAGE_H_
+#endif // D_BT_PORT_MESSAGE_H

src/BtPostDownloadHandler.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_POST_DOWNLOAD_HANDLER_H_
-#define _D_BT_POST_DOWNLOAD_HANDLER_H_
+#ifndef D_BT_POST_DOWNLOAD_HANDLER_H
+#define D_BT_POST_DOWNLOAD_HANDLER_H
 
 #include "PostDownloadHandler.h"
 
@@ -53,4 +53,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_POST_DOWNLOAD_HANDLER_H_
+#endif // D_BT_POST_DOWNLOAD_HANDLER_H

src/BtProgressInfoFile.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_PROGRESS_INFO_FILE_H_
-#define _D_BT_PROGRESS_INFO_FILE_H_
+#ifndef D_BT_PROGRESS_INFO_FILE_H
+#define D_BT_PROGRESS_INFO_FILE_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -63,4 +63,4 @@ typedef SharedHandle<BtProgressInfoFile> BtProgressInfoFileHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_PROGRESS_INFO_FILE_H_
+#endif // D_BT_PROGRESS_INFO_FILE_H

src/BtRegistry.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_REGISTRY_H_
-#define _D_BT_REGISTRY_H_
+#ifndef D_BT_REGISTRY_H
+#define D_BT_REGISTRY_H
 
 #include "common.h"
 
@@ -116,4 +116,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_REGISTRY_H_
+#endif // D_BT_REGISTRY_H

src/BtRejectMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_REJECT_MESSAGE_H_
-#define _D_BT_REJECT_MESSAGE_H_
+#ifndef D_BT_REJECT_MESSAGE_H
+#define D_BT_REJECT_MESSAGE_H
 
 #include "RangeBtMessage.h"
 
@@ -59,4 +59,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_REJECT_MESSAGE_H_
+#endif // D_BT_REJECT_MESSAGE_H

src/BtRequestFactory.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_REQUEST_FACTORY_H_
-#define _D_BT_REQUEST_FACTORY_H_
+#ifndef D_BT_REQUEST_FACTORY_H
+#define D_BT_REQUEST_FACTORY_H
 
 #include "common.h"
 
@@ -92,4 +92,4 @@ typedef WeakHandle<BtRequestFactory> BtRequestFactoryWeakHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_REQUEST_FACTORY_H_
+#endif // D_BT_REQUEST_FACTORY_H

src/BtRequestMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_REQUEST_MESSAGE_H_
-#define _D_BT_REQUEST_MESSAGE_H_
+#ifndef D_BT_REQUEST_MESSAGE_H
+#define D_BT_REQUEST_MESSAGE_H
 
 #include "RangeBtMessage.h"
 
@@ -72,4 +72,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_REQUEST_MESSAGE_H_
+#endif // D_BT_REQUEST_MESSAGE_H

src/BtRuntime.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_RUNTIME_H_
-#define _D_BT_RUNTIME_H_
+#ifndef D_BT_RUNTIME_H
+#define D_BT_RUNTIME_H
 
 #include "common.h"
 #include "BtConstants.h"
@@ -135,4 +135,4 @@ typedef SharedHandle<BtRuntime> BtRuntimeHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_RUNTIME_H_
+#endif // D_BT_RUNTIME_H

src/BtSeederStateChoke.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_SEEDER_STATE_CHOKE_H_
-#define _D_BT_SEEDER_STATE_CHOKE_H_
+#ifndef D_BT_SEEDER_STATE_CHOKE_H
+#define D_BT_SEEDER_STATE_CHOKE_H
 
 #include "common.h"
 
@@ -102,4 +102,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_SEEDER_STATE_CHOKE_H_
+#endif // D_BT_SEEDER_STATE_CHOKE_H

src/BtSetup.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_SETUP_H_
-#define _D_BT_SETUP_H_
+#ifndef D_BT_SETUP_H
+#define D_BT_SETUP_H
 
 #include "common.h"
 #include <vector>
@@ -60,4 +60,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_SETUP_H_
+#endif // D_BT_SETUP_H

src/BtStopDownloadCommand.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_STOP_DOWNLOAD_COMMAND_H_
-#define _D_BT_STOP_DOWNLOAD_COMMAND_H_
+#ifndef D_BT_STOP_DOWNLOAD_COMMAND_H
+#define D_BT_STOP_DOWNLOAD_COMMAND_H
 
 #include "TimeBasedCommand.h"
 #include "SharedHandle.h"
@@ -81,4 +81,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_STOP_DOWNLOAD_COMMAND_H_
+#endif // D_BT_STOP_DOWNLOAD_COMMAND_H

src/BtSuggestPieceMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_SUGGEST_PIECE_MESSAGE_H_
-#define _D_BT_SUGGEST_PIECE_MESSAGE_H_
+#ifndef D_BT_SUGGEST_PIECE_MESSAGE_H
+#define D_BT_SUGGEST_PIECE_MESSAGE_H
 
 #include "IndexBtMessage.h"
 
@@ -61,4 +61,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_SUGGEST_PIECE_MESSAGE_H_
+#endif // D_BT_SUGGEST_PIECE_MESSAGE_H

src/BtUnchokeMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_UNCHOKE_MESSAGE_H_
-#define _D_BT_UNCHOKE_MESSAGE_H_
+#ifndef D_BT_UNCHOKE_MESSAGE_H
+#define D_BT_UNCHOKE_MESSAGE_H
 
 #include "ZeroBtMessage.h"
 
@@ -65,4 +65,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_UNCHOKE_MESSAGE_H_
+#endif // D_BT_UNCHOKE_MESSAGE_H

src/ByteArrayDiskWriter.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BYTE_ARRAY_DISK_WRITER_H_
-#define _D_BYTE_ARRAY_DISK_WRITER_H_
+#ifndef D_BYTE_ARRAY_DISK_WRITER_H
+#define D_BYTE_ARRAY_DISK_WRITER_H
 
 #include "DiskWriter.h"
 #include <sstream>
@@ -81,4 +81,4 @@ typedef SharedHandle<ByteArrayDiskWriter> ByteArrayDiskWriterHandle;
 
 } // namespace aria2
 
-#endif // _D_BYTE_ARRAY_DISK_WRITER_H_
+#endif // D_BYTE_ARRAY_DISK_WRITER_H

src/ByteArrayDiskWriterFactory.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BYTE_ARRAY_DISK_WRITER_FACTORY_H_
-#define _D_BYTE_ARRAY_DISK_WRITER_FACTORY_H_
+#ifndef D_BYTE_ARRAY_DISK_WRITER_FACTORY_H
+#define D_BYTE_ARRAY_DISK_WRITER_FACTORY_H
 
 #include "DiskWriterFactory.h"
 
@@ -51,4 +51,4 @@ typedef SharedHandle<ByteArrayDiskWriterFactory> ByteArrayDiskWriterFactoryHandl
 
 } // namespace aria2
 
-#endif // _D_BYTE_ARRAY_DISK_WRITER_FACTORY_H_
+#endif // D_BYTE_ARRAY_DISK_WRITER_FACTORY_H

src/CUIDCounter.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CUID_COUNTER_H_
-#define _D_CUID_COUNTER_H_
+#ifndef D_CUID_COUNTER_H
+#define D_CUID_COUNTER_H
 
 #include "common.h"
 #include "Command.h"
@@ -59,4 +59,4 @@ public:
 
 }
 
-#endif // _D_CUID_COUNTER_H_
+#endif // D_CUID_COUNTER_H

src/CheckIntegrityCommand.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CHECK_INTEGRITY_COMMAND_H_
-#define _D_CHECK_INTEGRITY_COMMAND_H_
+#ifndef D_CHECK_INTEGRITY_COMMAND_H
+#define D_CHECK_INTEGRITY_COMMAND_H
 
 #include "RealtimeCommand.h"
 #include "SharedHandle.h"
@@ -60,4 +60,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_CHECK_INTEGRITY_COMMAND_H_
+#endif // D_CHECK_INTEGRITY_COMMAND_H

src/CheckIntegrityDispatcherCommand.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CHECK_INTEGRITY_DISPATCHER_COMMAND_H_
-#define _D_CHECK_INTEGRITY_DISPATCHER_COMMAND_H_
+#ifndef D_CHECK_INTEGRITY_DISPATCHER_COMMAND_H
+#define D_CHECK_INTEGRITY_DISPATCHER_COMMAND_H
 
 #include "SequentialDispatcherCommand.h"
 #include "CheckIntegrityMan.h"
@@ -56,4 +56,4 @@ protected:
 
 } // namespace aria2
 
-#endif // _D_CHECK_INTEGRITY_DISPATCHER_COMMAND_H_
+#endif // D_CHECK_INTEGRITY_DISPATCHER_COMMAND_H

src/CheckIntegrityEntry.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CHECK_INTEGRITY_ENTRY_H_
-#define _D_CHECK_INTEGRITY_ENTRY_H_
+#ifndef D_CHECK_INTEGRITY_ENTRY_H
+#define D_CHECK_INTEGRITY_ENTRY_H
 
 #include "RequestGroupEntry.h"
 #include "ProgressAwareEntry.h"
@@ -84,4 +84,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_CHECK_INTEGRITY_ENTRY_H_
+#endif // D_CHECK_INTEGRITY_ENTRY_H

src/CheckIntegrityMan.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CHECK_INTEGRITY_MAN_H_
-#define _D_CHECK_INTEGRITY_MAN_H_
+#ifndef D_CHECK_INTEGRITY_MAN_H
+#define D_CHECK_INTEGRITY_MAN_H
 
 #include "common.h"
 #include "SequentialPicker.h"
@@ -46,4 +46,4 @@ typedef SequentialPicker<CheckIntegrityEntry> CheckIntegrityMan;
 
 } // namespace aria2
 
-#endif // _D_CHECK_INTEGRITY_MAN_H_
+#endif // D_CHECK_INTEGRITY_MAN_H

src/Checksum.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CHECKSUM_H_
-#define _D_CHECKSUM_H_
+#ifndef D_CHECKSUM_H
+#define D_CHECKSUM_H
 
 #include "common.h"
 
@@ -79,4 +79,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_CHECKSUM_H_
+#endif // D_CHECKSUM_H

src/ChecksumCheckIntegrityEntry.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CHECKSUM_CHECK_INTEGRITY_ENTRY_H_
-#define _D_CHECKSUM_CHECK_INTEGRITY_ENTRY_H_
+#ifndef D_CHECKSUM_CHECK_INTEGRITY_ENTRY_H
+#define D_CHECKSUM_CHECK_INTEGRITY_ENTRY_H
 
 #include "CheckIntegrityEntry.h"
 
@@ -66,4 +66,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_CHECKSUM_CHECK_INTEGRITY_ENTRY_H_
+#endif // D_CHECKSUM_CHECK_INTEGRITY_ENTRY_H

src/ChunkChecksum.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CHUNK_CHECKSUM_H_
-#define _D_CHUNK_CHECKSUM_H_
+#ifndef D_CHUNK_CHECKSUM_H
+#define D_CHUNK_CHECKSUM_H
 
 #include "common.h"
 
@@ -122,4 +122,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_CHUNK_CHECKSUM_H_
+#endif // D_CHUNK_CHECKSUM_H

src/Command.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_COMMAND_H_
-#define _D_COMMAND_H_
+#ifndef D_COMMAND_H
+#define D_COMMAND_H
 
 #include "common.h"
 #include <stdint.h>
@@ -125,4 +125,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_COMMAND_H_
+#endif // D_COMMAND_H

src/ConsoleStatCalc.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CONSOLE_STAT_CALC_H_
-#define _D_CONSOLE_STAT_CALC_H_
+#ifndef D_CONSOLE_STAT_CALC_H
+#define D_CONSOLE_STAT_CALC_H
 
 #include "StatCalc.h"
 #include "TimerA2.h"
@@ -91,4 +91,4 @@ typedef SharedHandle<ConsoleStatCalc> ConsoleStatCalcHandle;
 
 } // namespace aria2
 
-#endif // _D_CONSOLE_STAT_CALC_H_
+#endif // D_CONSOLE_STAT_CALC_H

src/ContentTypeRequestGroupCriteria.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CONTENT_TYPE_REQUEST_GROUP_CRITERIA_H_
-#define _D_CONTENT_TYPE_REQUEST_GROUP_CRITERIA_H_
+#ifndef D_CONTENT_TYPE_REQUEST_GROUP_CRITERIA_H
+#define D_CONTENT_TYPE_REQUEST_GROUP_CRITERIA_H
 
 #include "RequestGroupCriteria.h"
 #include <string>
@@ -60,4 +60,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_CONTENT_TYPE_REQUEST_GROUP_CRITERIA_H_
+#endif // D_CONTENT_TYPE_REQUEST_GROUP_CRITERIA_H

src/CookieStorage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_COOKIE_STORAGE_H_
-#define _D_COOKIE_STORAGE_H_
+#ifndef D_COOKIE_STORAGE_H
+#define D_COOKIE_STORAGE_H
 
 #include "common.h"
 
@@ -191,4 +191,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_COOKIE_STORAGE_H_
+#endif // D_COOKIE_STORAGE_H

src/CreateRequestCommand.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CREATE_REQUEST_COMMAND_H_
-#define _D_CREATE_REQUEST_COMMAND_H_
+#ifndef D_CREATE_REQUEST_COMMAND_H
+#define D_CREATE_REQUEST_COMMAND_H
 
 #include "AbstractCommand.h"
 
@@ -50,4 +50,4 @@ protected:
 
 } // namespace aria2
 
-#endif // _D_CREATE_REQUEST_COMMAND_H_
+#endif // D_CREATE_REQUEST_COMMAND_H

src/DHKeyExchange.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DH_KEY_EXCHANGE_H_
-#define _D_DH_KEY_EXCHANGE_H_
+#ifndef D_DH_KEY_EXCHANGE_H
+#define D_DH_KEY_EXCHANGE_H
 
 #include "common.h"
 #ifdef HAVE_LIBGCRYPT
@@ -42,4 +42,4 @@
 # include "LibsslDHKeyExchange.h"
 #endif // HAVE_LIBSSL
 
-#endif // _D_DH_KEY_EXCHANGE_H_
+#endif // D_DH_KEY_EXCHANGE_H

src/DHTAbstractMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_ABSTRACT_MESSAGE_H_
-#define _D_DHT_ABSTRACT_MESSAGE_H_
+#ifndef D_DHT_ABSTRACT_MESSAGE_H
+#define D_DHT_ABSTRACT_MESSAGE_H
 
 #include "DHTMessage.h"
 #include "A2STR.h"
@@ -101,4 +101,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_ABSTRACT_MESSAGE_H_
+#endif // D_DHT_ABSTRACT_MESSAGE_H

src/DHTAbstractNodeLookupTask.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_ABSTRACT_NODE_LOOKUP_TASK_H_
-#define _D_DHT_ABSTRACT_NODE_LOOKUP_TASK_H_
+#ifndef D_DHT_ABSTRACT_NODE_LOOKUP_TASK_H
+#define D_DHT_ABSTRACT_NODE_LOOKUP_TASK_H
 
 #include "DHTAbstractTask.h"
 
@@ -234,4 +234,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_ABSTRACT_NODE_LOOKUP_TASK_H_
+#endif // D_DHT_ABSTRACT_NODE_LOOKUP_TASK_H

src/DHTAbstractTask.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_ABSTRACT_TASK_H_
-#define _D_DHT_ABSTRACT_TASK_H_
+#ifndef D_DHT_ABSTRACT_TASK_H
+#define D_DHT_ABSTRACT_TASK_H
 
 #include "DHTTask.h"
 #include "SharedHandle.h"
@@ -118,4 +118,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_ABSTRACT_TASK_H_
+#endif // D_DHT_ABSTRACT_TASK_H

src/DHTAnnouncePeerMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_ANNOUNCE_PEER_MESSAGE_H_
-#define _D_DHT_ANNOUNCE_PEER_MESSAGE_H_
+#ifndef D_DHT_ANNOUNCE_PEER_MESSAGE_H
+#define D_DHT_ANNOUNCE_PEER_MESSAGE_H
 
 #include "DHTQueryMessage.h"
 #include "DHTConstants.h"
@@ -105,4 +105,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_ANNOUNCE_PEER_MESSAGE_H_
+#endif // D_DHT_ANNOUNCE_PEER_MESSAGE_H

src/DHTAnnouncePeerReplyMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_ANNOUNCE_PEER_REPLY_MESSAGE_H_
-#define _D_DHT_ANNOUNCE_PEER_REPLY_MESSAGE_H_
+#ifndef D_DHT_ANNOUNCE_PEER_REPLY_MESSAGE_H
+#define D_DHT_ANNOUNCE_PEER_REPLY_MESSAGE_H
 
 #include "DHTResponseMessage.h"
 
@@ -60,4 +60,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_ANNOUNCE_PEER_REPLY_MESSAGE_H_
+#endif // D_DHT_ANNOUNCE_PEER_REPLY_MESSAGE_H

src/DHTAutoSaveCommand.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_AUTO_SAVE_COMMAND_H_
-#define _D_DHT_AUTO_SAVE_COMMAND_H_
+#ifndef D_DHT_AUTO_SAVE_COMMAND_H
+#define D_DHT_AUTO_SAVE_COMMAND_H
 
 #include "TimeBasedCommand.h"
 #include "SharedHandle.h"
@@ -70,4 +70,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_AUTO_SAVE_COMMAND_H_
+#endif // D_DHT_AUTO_SAVE_COMMAND_H

src/DHTBucket.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_BUCKET_H_
-#define _D_DHT_BUCKET_H_
+#ifndef D_DHT_BUCKET_H
+#define D_DHT_BUCKET_H
 
 #include "common.h"
 
@@ -157,4 +157,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_BUCKET_H_
+#endif // D_DHT_BUCKET_H

src/DHTBucketRefreshCommand.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_BUCKET_REFRESH_COMMAND_H_
-#define _D_DHT_BUCKET_REFRESH_COMMAND_H_
+#ifndef D_DHT_BUCKET_REFRESH_COMMAND_H
+#define D_DHT_BUCKET_REFRESH_COMMAND_H
 
 #include "TimeBasedCommand.h"
 #include "SharedHandle.h"
@@ -69,4 +69,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_BUCKET_REFRESH_COMMAND_H_
+#endif // D_DHT_BUCKET_REFRESH_COMMAND_H

src/DHTBucketRefreshTask.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_BUCKET_REFRESH_TASK_H_
-#define _D_DHT_BUCKET_REFRESH_TASK_H_
+#ifndef D_DHT_BUCKET_REFRESH_TASK_H
+#define D_DHT_BUCKET_REFRESH_TASK_H
 
 #include "DHTAbstractTask.h"
 
@@ -55,4 +55,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_BUCKET_REFRESH_TASK_H_
+#endif // D_DHT_BUCKET_REFRESH_TASK_H

src/DHTConnection.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_CONNECTION_H_
-#define _D_DHT_CONNECTION_H_
+#ifndef D_DHT_CONNECTION_H
+#define D_DHT_CONNECTION_H
 
 #include "common.h"
 #include <string>
@@ -53,4 +53,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_CONNECTION_H_
+#endif // D_DHT_CONNECTION_H

src/DHTConnectionImpl.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_CONNECTION_IMPL_H_
-#define _D_DHT_CONNECTION_IMPL_H_
+#ifndef D_DHT_CONNECTION_IMPL_H
+#define D_DHT_CONNECTION_IMPL_H
 
 #include "DHTConnection.h"
 #include "SharedHandle.h"
@@ -90,4 +90,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_CONNECTION_IMPL_H_
+#endif // D_DHT_CONNECTION_IMPL_H

src/DHTConstants.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_CONSTANTS_H_
-#define _D_DHT_CONSTANTS_H_
+#ifndef D_DHT_CONSTANTS_H
+#define D_DHT_CONSTANTS_H
 
 // Increment this if major improvements or bug fixes are made in DHT
 // code. This is 2 bytes unsigned integer.
@@ -62,4 +62,4 @@
 
 #define DHT_TOKEN_UPDATE_INTERVAL (10*60)
 
-#endif // _D_DHT_CONSTANTS_H_
+#endif // D_DHT_CONSTANTS_H

src/DHTEntryPointNameResolveCommand.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_ENTRY_POINT_NAME_RESOVE_COMMAND_H_
-#define _D_DHT_ENTRY_POINT_NAME_RESOVE_COMMAND_H_
+#ifndef D_DHT_ENTRY_POINT_NAME_RESOVE_COMMAND_H
+#define D_DHT_ENTRY_POINT_NAME_RESOVE_COMMAND_H
 
 #include "Command.h"
 
@@ -109,4 +109,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_ENTRY_POINT_NAME_RESOVE_COMMAND_H_
+#endif // D_DHT_ENTRY_POINT_NAME_RESOVE_COMMAND_H

src/DHTFindNodeMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_FIND_NODE_MESSAGE_H_
-#define _D_DHT_FIND_NODE_MESSAGE_H_
+#ifndef D_DHT_FIND_NODE_MESSAGE_H
+#define D_DHT_FIND_NODE_MESSAGE_H
 
 #include "DHTQueryMessage.h"
 #include "DHTConstants.h"
@@ -72,4 +72,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_FIND_NODE_MESSAGE_H_
+#endif // D_DHT_FIND_NODE_MESSAGE_H

src/DHTFindNodeReplyMessage.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_FIND_NODE_REPLY_MESSAGE_H_
-#define _D_DHT_FIND_NODE_REPLY_MESSAGE_H_
+#ifndef D_DHT_FIND_NODE_REPLY_MESSAGE_H
+#define D_DHT_FIND_NODE_REPLY_MESSAGE_H
 
 #include "DHTResponseMessage.h"
 #include <vector>
@@ -80,4 +80,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_FIND_NODE_REPLY_MESSAGE_H_
+#endif // D_DHT_FIND_NODE_REPLY_MESSAGE_H