diff options
author | Markus Grüneis <gimpf@gimpf.org> | 2009-11-11 20:35:10 +0000 |
---|---|---|
committer | Markus Grüneis <gimpf@gimpf.org> | 2009-11-11 20:35:10 +0000 |
commit | 7ca06c7c5a0ae4bb38a67948a03ad8585f925707 (patch) | |
tree | 3b6c04f5c3deb795f48d8419c7420e1820eacb59 | |
parent | added hidden ebuid-compat option to configure script (diff) |
fixed header file include guards to be C++ compliant; now always use format ANYTUN_<filename>_INCLUDED
44 files changed, 111 insertions, 99 deletions
diff --git a/src/anytunError.h b/src/anytunError.h index 4bd2819..d500545 100644 --- a/src/anytunError.h +++ b/src/anytunError.h @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _ANYTUN_ERROR_H -#define _ANYTUN_ERROR_H +#ifndef ANYTUN_anytunError_h_INCLUDED +#define ANYTUN_anytunError_h_INCLUDED #include <sstream> #include <boost/system/system_error.hpp> diff --git a/src/authAlgo.h b/src/authAlgo.h index ac80643..1c7fa1b 100644 --- a/src/authAlgo.h +++ b/src/authAlgo.h @@ -29,9 +29,8 @@ * You should have received a copy of the GNU General Public License * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ - -#ifndef _AUTHALGO_H_ -#define _AUTHALGO_H_ +#ifndef ANYTUN_authAlgo_h_INCLUDED +#define ANYTUN_authAlgo_h_INCLUDED #include "datatypes.h" #include "buffer.h" diff --git a/src/authAlgoFactory.h b/src/authAlgoFactory.h index f042382..db3125b 100644 --- a/src/authAlgoFactory.h +++ b/src/authAlgoFactory.h @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _AUTHALGO_FACTORY_H_ -#define _AUTHALGO_FACTORY_H_ +#ifndef ANYTUN_authAlgoFactory_h_INCLUDED +#define ANYTUN_authAlgoFactory_h_INCLUDED #include <string> diff --git a/src/buffer.h b/src/buffer.h index 69cd060..bbece3d 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _BUFFER_H_ -#define _BUFFER_H_ +#ifndef ANYTUN_buffer_h_INCLUDED +#define ANYTUN_buffer_h_INCLUDED #include "datatypes.h" #include <string> diff --git a/src/cipher.h b/src/cipher.h index d1edb5f..92c4ef2 100644 --- a/src/cipher.h +++ b/src/cipher.h @@ -29,9 +29,8 @@ * You should have received a copy of the GNU General Public License * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ - -#ifndef _CIPHER_H_ -#define _CIPHER_H_ +#ifndef ANYTUN_cipher_h_INCLUDED +#define ANYTUN_cipher_h_INCLUDED #include "datatypes.h" #include "buffer.h" diff --git a/src/cipherFactory.h b/src/cipherFactory.h index 33171f7..96a8d33 100644 --- a/src/cipherFactory.h +++ b/src/cipherFactory.h @@ -29,9 +29,8 @@ * You should have received a copy of the GNU General Public License * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ - -#ifndef _CIPHER_FACTORY_H_ -#define _CIPHER_FACTORY_H_ +#ifndef ANYTUN_cipherFactory_h_INCLUDED +#define ANYTUN_cipherFactory_h_INCLUDED #include <string> diff --git a/src/connectionList.h b/src/connectionList.h index b85ef16..29eb94f 100644 --- a/src/connectionList.h +++ b/src/connectionList.h @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _CONNECTION_LIST_H -#define _CONNECTION_LIST_H +#ifndef ANYTUN_connectionList_h_INCLUDED +#define ANYTUN_connectionList_h_INCLUDED #include <map> #include <deque> diff --git a/src/connectionParam.h b/src/connectionParam.h index d864f67..ed24531 100644 --- a/src/connectionParam.h +++ b/src/connectionParam.h @@ -29,9 +29,8 @@ * You should have received a copy of the GNU General Public License * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ - -#ifndef _CONNECTIONPARAM_H_ -#define _CONNECTIONPARAM_H_ +#ifndef ANYTUN_connectionParam_h_INCLUDED +#define ANYTUN_connectionParam_h_INCLUDED #include "keyDerivation.h" #include "seqWindow.h" diff --git a/src/cryptinit.hpp b/src/cryptinit.hpp index 3aa9fdb..c171c15 100644 --- a/src/cryptinit.hpp +++ b/src/cryptinit.hpp @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _CRYPTINIT_HPP -#define _CRYPTINIT_HPP +#ifndef ANYTUN_cryptinit_hpp_INCLUDED +#define ANYTUN_cryptinit_hpp_INCLUDED #ifndef NO_CRYPT #ifndef USE_SSL_CRYPTO @@ -111,4 +111,3 @@ bool initLibGCrypt() #endif #endif - diff --git a/src/daemon.hpp b/src/daemon.hpp index 3bab727..04834ca 100644 --- a/src/daemon.hpp +++ b/src/daemon.hpp @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _DAEMON_HPP -#define _DAEMON_HPP +#ifndef ANYTUN_daemon_hpp_INCLUDED +#define ANYTUN_daemon_hpp_INCLUDED #ifndef NO_DAEMON #include <poll.h> @@ -163,4 +163,3 @@ void daemonize() } #endif #endif - diff --git a/src/datatypes.h b/src/datatypes.h index db47414..4e5977d 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _DATATYPES_H_ -#define _DATATYPES_H_ +#ifndef ANYTUN_datatypes_h_INCLUDED +#define ANYTUN_datatypes_h_INCLUDED #include <boost/cstdint.hpp> #include <boost/integer_traits.hpp> diff --git a/src/deviceConfig.hpp b/src/deviceConfig.hpp index fecbe81..6353cd1 100644 --- a/src/deviceConfig.hpp +++ b/src/deviceConfig.hpp @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _DEVICE_CONFIG_HPP_ -#define _DEVICE_CONFIG_HPP_ +#ifndef ANYTUN_deviceConfig_hpp_INCLUDED +#define ANYTUN_deviceConfig_hpp_INCLUDED #include "networkAddress.h" #include <boost/asio.hpp> diff --git a/src/encryptedPacket.h b/src/encryptedPacket.h index 97a0a59..bd321b3 100644 --- a/src/encryptedPacket.h +++ b/src/encryptedPacket.h @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _ENCRYPTED_PACKET_H_ -#define _ENCRYPTED_PACKET_H_ +#ifndef ANYTUN_encryptedPacket_h_INCLUDED +#define ANYTUN_encryptedPacket_h_INCLUDED #include "datatypes.h" #include "buffer.h" diff --git a/src/endian.h b/src/endian.h index 691258b..75646e7 100644 --- a/src/endian.h +++ b/src/endian.h @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _ENDIAN_H_ -#define _ENDIAN_H_ +#ifndef ANYTUN_endian_h_INCLUDED +#define ANYTUN_endian_h_INCLUDED #ifndef _WIN32 #include <arpa/inet.h> diff --git a/src/keyDerivation.h b/src/keyDerivation.h index bd5f376..eea4266 100644 --- a/src/keyDerivation.h +++ b/src/keyDerivation.h @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _KEYDERIVATION_H_ -#define _KEYDERIVATION_H_ +#ifndef ANYTUN_keyDerivation_h_INCLUDED +#define ANYTUN_keyDerivation_h_INCLUDED #include "datatypes.h" #include "buffer.h" @@ -202,4 +202,3 @@ private: #endif #endif - diff --git a/src/keyDerivationFactory.h b/src/keyDerivationFactory.h index c80c32c..caafe7e 100644 --- a/src/keyDerivationFactory.h +++ b/src/keyDerivationFactory.h @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _KEYDERIVATION_FACTORY_H_ -#define _KEYDERIVATION_FACTORY_H_ +#ifndef ANYTUN_keyDerivationFactory_h_INCLUDED +#define ANYTUN_keyDerivationFactory_h_INCLUDED #include <string> @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _LOG_H_ -#define _LOG_H_ +#ifndef ANYTUN_log_h_INCLUDED +#define ANYTUN_log_h_INCLUDED #include <string> #include <sstream> diff --git a/src/logTargets.h b/src/logTargets.h index 673aa2e..63156c1 100644 --- a/src/logTargets.h +++ b/src/logTargets.h @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _LOG_TARGETS_H_ -#define _LOG_TARGETS_H_ +#ifndef ANYTUN_logTargets_h_INCLUDED +#define ANYTUN_logTargets_h_INCLUDED #include <string> #include <map> diff --git a/src/networkAddress.h b/src/networkAddress.h index c9acd0b..dc4c7ac 100644 --- a/src/networkAddress.h +++ b/src/networkAddress.h @@ -30,8 +30,10 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _NETWORK_ADDRESS_H -#define _NETWORK_ADDRESS_H +#ifndef ANYTUN_networkAddress_h_INCLUDED +#define ANYTUN_networkAddress_h_INCLUDED + +// TODO not required here #include <boost/archive/text_oarchive.hpp> #include <boost/archive/text_iarchive.hpp> diff --git a/src/networkPrefix.h b/src/networkPrefix.h index 04cbbac..1c023ed 100644 --- a/src/networkPrefix.h +++ b/src/networkPrefix.h @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _NETWORK_PREFIX_H -#define _NETWORK_PREFIX_H +#ifndef ANYTUN_networkPrefix_h_INCLUDED +#define ANYTUN_networkPrefix_h_INCLUDED #include "threadUtils.hpp" #include "datatypes.h" diff --git a/src/options.h b/src/options.h index be39adf..92fc89f 100644 --- a/src/options.h +++ b/src/options.h @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _OPTIONS_H_ -#define _OPTIONS_H_ +#ifndef ANYTUN_options_h_INCLUDED +#define ANYTUN_options_h_INCLUDED #include "datatypes.h" #include "buffer.h" diff --git a/src/packetSource.h b/src/packetSource.h index 171e6c1..626a259 100644 --- a/src/packetSource.h +++ b/src/packetSource.h @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _PACKET_SOURCE_H_ -#define _PACKET_SOURCE_H_ +#ifndef ANYTUN_packetSource_h_INCLUDED +#define ANYTUN_packetSource_h_INCLUDED #include <boost/asio.hpp> diff --git a/src/plainPacket.h b/src/plainPacket.h index 2316d90..8cf0368 100644 --- a/src/plainPacket.h +++ b/src/plainPacket.h @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _PLAIN_PACKET_H_ -#define _PLAIN_PACKET_H_ +#ifndef ANYTUN_plainPacket_h_INCLUDED +#define ANYTUN_plainPacket_h_INCLUDED #include "datatypes.h" #include "buffer.h" diff --git a/src/resolver.h b/src/resolver.h index 00d0edb..dfec8cc 100644 --- a/src/resolver.h +++ b/src/resolver.h @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _RESOLVER_H_ -#define _RESOLVER_H_ +#ifndef ANYTUN_resolver_h_INCLUDED +#define ANYTUN_resolver_h_INCLUDED #include <queue> #include <boost/asio.hpp> diff --git a/src/routingTable.h b/src/routingTable.h index 3803719..4a60ec3 100644 --- a/src/routingTable.h +++ b/src/routingTable.h @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _ROUTINGTABLE_H -#define _ROUTINGTABLE_H +#ifndef ANYTUN_routingTable_h_INCLUDED +#define ANYTUN_routingTable_h_INCLUDED #include <map> #include <deque> diff --git a/src/routingTree.hpp b/src/routingTree.hpp index 3184c0a..89b7c18 100644 --- a/src/routingTree.hpp +++ b/src/routingTree.hpp @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __ROUTING_TREE_ -#define __ROUTING_TREE_ +#ifndef ANYTUN_routingTree_hpp_INCLUDED +#define ANYTUN_routingTree_hpp_INCLUDED #include "anytunError.h" @@ -101,5 +101,3 @@ public: }; #endif - - diff --git a/src/routingTreeNode.h b/src/routingTreeNode.h index 5660384..9efc6f2 100644 --- a/src/routingTreeNode.h +++ b/src/routingTreeNode.h @@ -30,9 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _ROUTING_TREE_NODE_H -#define _ROUTING_TREE_NODE_H - +#ifndef ANYTUN_routingTreeNode_h_INCLUDED +#define ANYTUN_routingTreeNode_h_INCLUDED #include "threadUtils.hpp" #include "datatypes.h" diff --git a/src/seqWindow.h b/src/seqWindow.h index 71555da..1090447 100644 --- a/src/seqWindow.h +++ b/src/seqWindow.h @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _SEQ_WINDOW_H_ -#define _SEQ_WINDOW_H_ +#ifndef ANYTUN_seqWindow_h_INCLUDED +#define ANYTUN_seqWindow_h_INCLUDED #include <map> #include <deque> diff --git a/src/signalController.h b/src/signalController.h index 90028d1..6108bea 100644 --- a/src/signalController.h +++ b/src/signalController.h @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _SIGNAL_CONTROLLER_H_ -#define _SIGNAL_CONTROLLER_H_ +#ifndef ANYTUN_signalController_h_INCLUDED +#define ANYTUN_signalController_h_INCLUDED #include <map> #include <queue> diff --git a/src/syncBuffer.h b/src/syncBuffer.h index b41e1c2..a9aee4e 100644 --- a/src/syncBuffer.h +++ b/src/syncBuffer.h @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _SYNCBUFFER_H_ -#define _SYNCBUFFER_H_ +#ifndef ANYTUN_syncBuffer_h_INCLUDED +#define ANYTUN_syncBuffer_h_INCLUDED #include <boost/archive/text_oarchive.hpp> #include <boost/archive/text_iarchive.hpp> diff --git a/src/syncClient.h b/src/syncClient.h index 56dfcf8..bc9d004 100644 --- a/src/syncClient.h +++ b/src/syncClient.h @@ -29,8 +29,8 @@ * You should have received a copy of the GNU General Public License * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _SYNCCLIENT_H -#define _SYNCCLIENT_H +#ifndef ANYTUN_syncClient_h_INCLUDED +#define ANYTUN_syncClient_h_INCLUDED #include <string> #include "syncTcpConnection.h" diff --git a/src/syncCommand.h b/src/syncCommand.h index a37d411..71c1ffe 100644 --- a/src/syncCommand.h +++ b/src/syncCommand.h @@ -29,8 +29,9 @@ * You should have received a copy of the GNU General Public License * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _SYNCCOMMAND_H -#define _SYNCCOMMAND_H +#ifndef ANYTUN_syncCommand_h_INCLUDED +#define ANYTUN_syncCommand_h_INCLUDED + #include <boost/archive/text_oarchive.hpp> #include <boost/archive/text_iarchive.hpp> @@ -77,4 +78,4 @@ private: }; -#endif // _SYNCCOMMAND_H +#endif diff --git a/src/syncConnectionCommand.h b/src/syncConnectionCommand.h index e9ade70..0c2eb43 100644 --- a/src/syncConnectionCommand.h +++ b/src/syncConnectionCommand.h @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _SYNCCONNECTIONCOMMAND_H -#define _SYNCCONNECTIONCOMMAND_H +#ifndef ANYTUN_syncConnectionCommands_h_INCLUDED +#define ANYTUN_syncConnectionCommands_h_INCLUDED #include <boost/archive/text_oarchive.hpp> #include <boost/archive/text_iarchive.hpp> @@ -62,4 +62,4 @@ private: }; -#endif // _SYNCCOMMAND_H +#endif diff --git a/src/syncOnConnect.hpp b/src/syncOnConnect.hpp index ac0c7f6..79df42f 100644 --- a/src/syncOnConnect.hpp +++ b/src/syncOnConnect.hpp @@ -30,6 +30,11 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef ANYTUN_syncOnConnect_hpp_INCLUDED +#define ANYTUN_syncOnConnect_hpp_INCLUDED + +// TODO required headers + void syncOnConnect(SyncTcpConnection * connptr) { //TODO Locking here @@ -67,3 +72,4 @@ void syncOnConnect(SyncTcpConnection * connptr) } } +#endif diff --git a/src/syncQueue.h b/src/syncQueue.h index 15395f1..8da82b9 100644 --- a/src/syncQueue.h +++ b/src/syncQueue.h @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _SYNC_QUEUE_H -#define _SYNC_QUEUE_H +#ifndef ANYTUN_syncQueue_h_INCLUDED +#define ANYTUN_syncQueue_h_INCLUDED #include <deque> #include <queue> diff --git a/src/syncRouteCommand.h b/src/syncRouteCommand.h index a31a98b..e91ffd0 100644 --- a/src/syncRouteCommand.h +++ b/src/syncRouteCommand.h @@ -29,8 +29,9 @@ * You should have received a copy of the GNU General Public License * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _SYNCROUTECOMMAND_H -#define _SYNCROUTECOMMAND_H +#ifndef ANYTUN_syncRouteCommands_h_INCLUDED +#define ANYTUN_syncRouteCommands_h_INCLUDED + #include <boost/archive/text_oarchive.hpp> #include <boost/archive/text_iarchive.hpp> @@ -63,4 +64,4 @@ private: }; -#endif // _SYNCCOMMAND_H +#endif diff --git a/src/syncServer.h b/src/syncServer.h index a5b362b..b73247f 100644 --- a/src/syncServer.h +++ b/src/syncServer.h @@ -30,10 +30,9 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _SYNC_SERVER_H_ -#define _SYNC_SERVER_H_ -//#include <iostream> -//#include <string> +#ifndef ANYTUN_syncServer_h_INCLUDED +#define ANYTUN_syncServer_h_INCLUDED + #include <boost/bind.hpp> #include <boost/shared_ptr.hpp> #include <boost/enable_shared_from_this.hpp> @@ -69,4 +68,5 @@ private: ConnectCallback onConnect_; Semaphore ready_sem_; }; + #endif diff --git a/src/syncTcpConnection.h b/src/syncTcpConnection.h index 6c32eba..e35c574 100644 --- a/src/syncTcpConnection.h +++ b/src/syncTcpConnection.h @@ -29,9 +29,9 @@ * You should have received a copy of the GNU General Public License * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef ANYTUN_syncTcpConnection_h_INCLUDED +#define ANYTUN_syncTcpConnection_h_INCLUDED -#ifndef _SYNCTCPCONNECTION_H_ -#define _SYNCTCPCONNECTION_H_ #include <boost/shared_ptr.hpp> #include <boost/enable_shared_from_this.hpp> #include <boost/function.hpp> @@ -63,4 +63,5 @@ private: size_t /*bytes_transferred*/); proto::socket socket_; }; + #endif diff --git a/src/sysExec.h b/src/sysExec.h index d2c2674..e608472 100644 --- a/src/sysExec.h +++ b/src/sysExec.h @@ -30,8 +30,9 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _SYSEXEC_H_ -#define _SYSEXEC_H_ +#ifndef ANYTUN_sysExec_h_INCLUDED +#define ANYTUN_sysExec_h_INCLUDED + #ifndef NO_EXEC #include <vector> diff --git a/src/threadUtils.hpp b/src/threadUtils.hpp index cbef167..7e33302 100644 --- a/src/threadUtils.hpp +++ b/src/threadUtils.hpp @@ -29,14 +29,16 @@ * You should have received a copy of the GNU General Public License * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef ANYTUN_threadUtils_hpp_INCLUDED +#define ANYTUN_threadUtils_hpp_INCLUDED + #include <boost/thread.hpp> #include <boost/thread/mutex.hpp> #include <boost/thread/shared_mutex.hpp> #include <boost/thread/condition.hpp> #include "datatypes.h" -#ifndef __THREADUTILS__ -#define __THREADUTILS__ + typedef boost::mutex::scoped_lock Lock; typedef boost::mutex Mutex; diff --git a/src/tunDevice.h b/src/tunDevice.h index e9c55cb..e00751f 100644 --- a/src/tunDevice.h +++ b/src/tunDevice.h @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _TUNDEVICE_H_ -#define _TUNDEVICE_H_ +#ifndef ANYTUN_tunDevice_h_INCLUDED +#define ANYTUN_tunDevice_h_INCLUDED #include "buffer.h" #include "deviceConfig.hpp" diff --git a/src/win32/common.h b/src/win32/common.h index 5aaab20..eaab2a6 100644 --- a/src/win32/common.h +++ b/src/win32/common.h @@ -25,6 +25,8 @@ * distribution); if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifndef ANYTUN_win32_common_h_INCLUDED +#define ANYTUN_win32_common_h_INCLUDED //=============================================== // This file is included both by OpenVPN and @@ -80,3 +82,5 @@ //========================================================= #define TAP_COMPONENT_ID "tap0901" + +#endif diff --git a/src/win32/registryKey.h b/src/win32/registryKey.h index 734bfd6..6aceba0 100644 --- a/src/win32/registryKey.h +++ b/src/win32/registryKey.h @@ -29,6 +29,8 @@ * You should have received a copy of the GNU General Public License * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef ANYTUN_win32_registryKey_h_INCLUDED +#define ANYTUN_win32_registryKey_h_INCLUDED #include <string.h> #include <windows.h> @@ -55,4 +57,6 @@ private: HKEY key_; bool opened_; std::string name_; -};
\ No newline at end of file +}; + +#endif diff --git a/src/win32/winService.h b/src/win32/winService.h index c46d3d0..6867c7c 100644 --- a/src/win32/winService.h +++ b/src/win32/winService.h @@ -30,8 +30,8 @@ * along with anytun. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _WIN_SERVICE_H_ -#define _WIN_SERVICE_H_ +#ifndef ANYTUN_win32_winService_h_INCLUDED +#define ANYTUN_win32_winService_h_INCLUDED #ifdef WIN_SERVICE @@ -79,4 +79,4 @@ extern WinService& gWinService; #endif -#endif
\ No newline at end of file +#endif |