From b24d382800c75652d7821e73509c7d1383d64242 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 12 Nov 2009 11:57:24 +0000 Subject: fixed include guards, new format: UANYTUN_filename_h_INCLUDED --- src/auth_algo.h | 4 ++-- src/cipher.h | 4 ++-- src/daemon.h | 4 ++-- src/datatypes.h | 4 ++-- src/encrypted_packet.h | 4 ++-- src/key_derivation.h | 4 ++-- src/log.h | 4 ++-- src/log_targets.h | 5 +++++ src/options.h | 4 ++-- src/plain_packet.h | 4 ++-- src/seq_window.h | 4 ++-- src/sig_handler.h | 4 ++-- src/string_list.h | 4 ++-- src/sysexec.h | 4 ++-- src/tun.h | 4 ++-- src/tun_helper.h | 4 ++-- src/udp.h | 4 ++-- 17 files changed, 37 insertions(+), 32 deletions(-) diff --git a/src/auth_algo.h b/src/auth_algo.h index 452fadf..1f08a3f 100644 --- a/src/auth_algo.h +++ b/src/auth_algo.h @@ -33,8 +33,8 @@ * along with uAnytun. If not, see . */ -#ifndef _AUTH_ALGO_H_ -#define _AUTH_ALGO_H_ +#ifndef UANYTUN_auth_algo_h_INCLUDED +#define UANYTUN_auth_algo_h_INCLUDED #ifndef USE_SSL_CRYPTO #include diff --git a/src/cipher.h b/src/cipher.h index e25e9a5..5ccbd5b 100644 --- a/src/cipher.h +++ b/src/cipher.h @@ -33,8 +33,8 @@ * along with uAnytun. If not, see . */ -#ifndef _CIPHER_H_ -#define _CIPHER_H_ +#ifndef UANYUTN_cipher_h_INCLUDED +#define UANYUTN_cipher_h_INCLUDED #ifndef NO_CRYPT #ifndef USE_SSL_CRYPTO diff --git a/src/daemon.h b/src/daemon.h index afe1a27..599ecec 100644 --- a/src/daemon.h +++ b/src/daemon.h @@ -33,8 +33,8 @@ * along with uAnytun. If not, see . */ -#ifndef _DAEMON_H_ -#define _DAEMON_H_ +#ifndef UANYUTN_daemon_h_INCLUDED +#define UANYUTN_daemon_h_INCLUDED #include #include diff --git a/src/datatypes.h b/src/datatypes.h index 1ac5d02..8c6bfff 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -33,8 +33,8 @@ * along with uAnytun. If not, see . */ -#ifndef _DATATYPES_H_ -#define _DATATYPES_H_ +#ifndef UANYUTN_datatypes_h_INCLUDED +#define UANYUTN_datatypes_h_INCLUDED #include #include diff --git a/src/encrypted_packet.h b/src/encrypted_packet.h index ef73a8b..245f75a 100644 --- a/src/encrypted_packet.h +++ b/src/encrypted_packet.h @@ -33,8 +33,8 @@ * along with uAnytun. If not, see . */ -#ifndef _ENCRYPTED_PACKET_H_ -#define _ENCRYPTED_PACKET_H_ +#ifndef UANYUTN_encrypted_packet_h_INCLUDED +#define UANYUTN_encrypted_packet_h_INCLUDED #define ENCRYPTED_PACKET_SIZE_MAX 1600 diff --git a/src/key_derivation.h b/src/key_derivation.h index 1fd5113..b11982e 100644 --- a/src/key_derivation.h +++ b/src/key_derivation.h @@ -33,8 +33,8 @@ * along with uAnytun. If not, see . */ -#ifndef _KEY_DERIVATION_H_ -#define _KEY_DERIVATION_H_ +#ifndef UANYUTN_key_derivation_h_INCLUDED +#define UANYUTN_key_derivation_h_INCLUDED #ifndef USE_SSL_CRYPTO #include diff --git a/src/log.h b/src/log.h index fc97549..513f506 100644 --- a/src/log.h +++ b/src/log.h @@ -33,8 +33,8 @@ * along with uAnytun. If not, see . */ -#ifndef _LOG_H_ -#define _LOG_H_ +#ifndef UANYUTN_log_h_INCLUDED +#define UANYUTN_log_h_INCLUDED #define MSG_LENGTH_MAX 150 diff --git a/src/log_targets.h b/src/log_targets.h index ca2d762..563d04c 100644 --- a/src/log_targets.h +++ b/src/log_targets.h @@ -33,6 +33,9 @@ * along with uAnytun. If not, see . */ +#ifndef UANYUTN_log_targets_h_INCLUDED +#define UANYUTN_log_targets_h_INCLUDED + #include static char* get_time_formatted() @@ -356,3 +359,5 @@ log_target_t* log_target_stderr_new() return tmp; } + +#endif diff --git a/src/options.h b/src/options.h index c5970e8..c37c4d5 100644 --- a/src/options.h +++ b/src/options.h @@ -33,8 +33,8 @@ * along with uAnytun. If not, see . */ -#ifndef _OPTIONS_H_ -#define _OPTIONS_H_ +#ifndef UANYUTN_options_h_INCLUDED +#define UANYUTN_options_h_INCLUDED #include "string_list.h" diff --git a/src/plain_packet.h b/src/plain_packet.h index f9c311c..94a20c1 100644 --- a/src/plain_packet.h +++ b/src/plain_packet.h @@ -33,8 +33,8 @@ * along with uAnytun. If not, see . */ -#ifndef _PLAIN_PACKET_H_ -#define _PLAIN_PACKET_H_ +#ifndef UANYUTN_plain_packet_h_INCLUDED +#define UANYUTN_plain_packet_h_INCLUDED #define PLAIN_PACKET_SIZE_MAX 1600 diff --git a/src/seq_window.h b/src/seq_window.h index 9d034e8..65f7570 100644 --- a/src/seq_window.h +++ b/src/seq_window.h @@ -33,8 +33,8 @@ * along with uAnytun. If not, see . */ -#ifndef _SEQ_WINDOW_H_ -#define _SEQ_WINDOW_H_ +#ifndef UANYUTN_seq_window_h_INCLUDED +#define UANYUTN_seq_window_h_INCLUDED struct seq_win_element_struct { sender_id_t sender_id_; diff --git a/src/sig_handler.h b/src/sig_handler.h index bc583bb..d88fed2 100644 --- a/src/sig_handler.h +++ b/src/sig_handler.h @@ -33,8 +33,8 @@ * along with uAnytun. If not, see . */ -#ifndef _SIG_HANDLER_H_ -#define _SIG_HANDLER_H_ +#ifndef UANYUTN_sig_handler_h_INCLUDED +#define UANYUTN_sig_handler_h_INCLUDED int signal_init(); int signal_handle(); diff --git a/src/string_list.h b/src/string_list.h index ed4ef13..df5ca75 100644 --- a/src/string_list.h +++ b/src/string_list.h @@ -33,8 +33,8 @@ * along with uAnytun. If not, see . */ -#ifndef _STRING_LIST_H_ -#define _STRING_LIST_H_ +#ifndef UANYUTN_string_list_h_INCLUDED +#define UANYUTN_string_list_h_INCLUDED struct string_list_element_struct { char* string_; diff --git a/src/sysexec.h b/src/sysexec.h index 13ae2bf..f81bb4c 100644 --- a/src/sysexec.h +++ b/src/sysexec.h @@ -33,8 +33,8 @@ * along with uAnytun. If not, see . */ -#ifndef _SYSEXEC_H_ -#define _SYSEXEC_H_ +#ifndef UANYUTN_sysexec_h_INCLUDED +#define UANYUTN_sysexec_h_INCLUDED int uanytun_exec(const char* script, char* const argv[], char* const evp[]); diff --git a/src/tun.h b/src/tun.h index daa4def..5489777 100644 --- a/src/tun.h +++ b/src/tun.h @@ -33,8 +33,8 @@ * along with uAnytun. If not, see . */ -#ifndef _TUN_H_ -#define _TUN_H_ +#ifndef UANYUTN_tun_h_INCLUDED +#define UANYUTN_tun_h_INCLUDED #include diff --git a/src/tun_helper.h b/src/tun_helper.h index 1f53f25..ff5f68f 100644 --- a/src/tun_helper.h +++ b/src/tun_helper.h @@ -33,8 +33,8 @@ * along with uAnytun. If not, see . */ -#ifndef _TUN_HELPER_H_ -#define _TUN_HELPER_H_ +#ifndef UANYUTN_tun_helper_h_INCLUDED +#define UANYUTN_tun_helper_h_INCLUDED #include #include diff --git a/src/udp.h b/src/udp.h index 622eb4c..e226abb 100644 --- a/src/udp.h +++ b/src/udp.h @@ -33,8 +33,8 @@ * along with uAnytun. If not, see . */ -#ifndef _UDP_H_ -#define _UDP_H_ +#ifndef UANYUTN_udp_h_INCLUDED +#define UANYUTN_udp_h_INCLUDED #include "options.h" -- cgit v1.2.3