From 5651efd165d6249867e2bc2f2b0eccbeea6bc380 Mon Sep 17 00:00:00 2001 From: wangyu- Date: Fri, 1 Sep 2017 17:40:55 -0500 Subject: [PATCH] fixed possible macro issue mentioned in #39 --- common.h | 4 ++-- encrypt.h | 4 ++-- lib/aes.h | 4 ++-- lib/aes_acc/aesarm.h | 4 ++-- lib/aes_acc/aesni.h | 4 ++-- lib/aes_acc/asm/arm_arch.h | 4 ++-- lib/md5.h | 4 ++-- log.h | 4 ++-- network.h | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/common.h b/common.h index fd78511..c16b5ea 100644 --- a/common.h +++ b/common.h @@ -5,8 +5,8 @@ * Author: wangyu */ -#ifndef COMMON_H_ -#define COMMON_H_ +#ifndef UDP2RAW_COMMON_H_ +#define UDP2RAW_COMMON_H_ #define __STDC_FORMAT_MACROS 1 #include diff --git a/encrypt.h b/encrypt.h index b1b4e63..8e03d78 100755 --- a/encrypt.h +++ b/encrypt.h @@ -1,5 +1,5 @@ -#ifndef _ENCRYPTION_H_ -#define _ENCRYPTION_H_ +#ifndef UDP2RAW_ENCRYPTION_H_ +#define UDP2RAW_ENCRYPTION_H_ diff --git a/lib/aes.h b/lib/aes.h index db6fddf..c01062a 100755 --- a/lib/aes.h +++ b/lib/aes.h @@ -2,8 +2,8 @@ * this file comes from https://github.com/kokke/tiny-AES128-C */ -#ifndef _AES_H_ -#define _AES_H_ +#ifndef UDP2RAW_AES_H_ +#define UDP2RAW_AES_H_ #include diff --git a/lib/aes_acc/aesarm.h b/lib/aes_acc/aesarm.h index 2178e42..15d6ede 100644 --- a/lib/aes_acc/aesarm.h +++ b/lib/aes_acc/aesarm.h @@ -26,8 +26,8 @@ * This file is part of mbed TLS (https://tls.mbed.org) */ -#ifndef _AESARM_H_ -#define _AESARM_H_ +#ifndef UDP2RAW_AESARM_H_ +#define UDP2RAW_AESARM_H_ #ifndef AES_ENCRYPT #define AES_ENCRYPT 1 diff --git a/lib/aes_acc/aesni.h b/lib/aes_acc/aesni.h index b106b9c..92563aa 100644 --- a/lib/aes_acc/aesni.h +++ b/lib/aes_acc/aesni.h @@ -26,8 +26,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef _AESNI_H_ -#define _AESNI_H_ +#ifndef UDP2RAW_AESNI_H_ +#define UDP2RAW_AESNI_H_ #ifndef AES_ENCRYPT #define AES_ENCRYPT 1 diff --git a/lib/aes_acc/asm/arm_arch.h b/lib/aes_acc/asm/arm_arch.h index 3fc9e69..f8186a9 100644 --- a/lib/aes_acc/asm/arm_arch.h +++ b/lib/aes_acc/asm/arm_arch.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef __ARM_ARCH_H__ -# define __ARM_ARCH_H__ +#ifndef UDP2RAW__ARM_ARCH_H__ +# define UDP2RAW__ARM_ARCH_H__ # if !defined(__ARM_ARCH__) # if defined(__CC_ARM) diff --git a/lib/md5.h b/lib/md5.h index 9851650..aa75606 100755 --- a/lib/md5.h +++ b/lib/md5.h @@ -1,5 +1,5 @@ -#ifndef _MD5_H_ -#define _MD5_H_ +#ifndef UDP2RAW_MD5_H_ +#define UDP2RAW_MD5_H_ #include #include diff --git a/log.h b/log.h index 3401b6d..f801c9a 100755 --- a/log.h +++ b/log.h @@ -1,6 +1,6 @@ -#ifndef _LOG_MYLOG_H_ -#define _LOG_MYLOG_H_ +#ifndef UDP2RAW_LOG_MYLOG_H_ +#define UDP2RAW_LOG_MYLOG_H_ #include diff --git a/network.h b/network.h index aa8b645..85b3b32 100644 --- a/network.h +++ b/network.h @@ -5,8 +5,8 @@ * Author: wangyu */ -#ifndef NETWORK_H_ -#define NETWORK_H_ +#ifndef UDP2RAW_NETWORK_H_ +#define UDP2RAW_NETWORK_H_ extern int raw_recv_fd; extern int raw_send_fd;