From a16ace2a46933dd2f7b9289ea1a98bff2756eea3 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sat, 19 Dec 2020 16:55:02 +0100 Subject: [PATCH] Remove pointless redefinition of 'privoxy_mutex_t' ... when compiling with FEATURE_HTTPS_INSPECTION. Silences warnings when compiling with "-std=c99": cc -c -pipe -fstack-protector-all -ggdb -Wshadow -Wconversion -I/usr/local/include/ -pthread -Wall -std=c99 errlog.c -o errlog.o In file included from errlog.c:70: ./jcc.h:66:25: warning: redefinition of typedef 'privoxy_mutex_t' is a C11 feature [-Wtypedef-redefinition] typedef pthread_mutex_t privoxy_mutex_t; ^ ./project.h:59:28: note: previous definition is here typedef pthread_mutex_t privoxy_mutex_t; ^ 1 warning generated. Compile-tested on Windows by Lee. --- project.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/project.h b/project.h index 14b957f8..44b62d19 100644 --- a/project.h +++ b/project.h @@ -54,20 +54,6 @@ #define HASH_OF_HOST_BUF_SIZE 16 #endif /* FEATURE_HTTPS_INSPECTION */ -#ifdef FEATURE_PTHREAD -# include - typedef pthread_mutex_t privoxy_mutex_t; -#else -# ifdef _WIN32 -# include - /* without winsock2.h I get lots of compiler warnings about - * #warning Please include winsock2.h before windows.h - */ -# include -# endif - typedef CRITICAL_SECTION privoxy_mutex_t; -#endif - #ifdef FEATURE_HTTPS_INSPECTION_MBEDTLS #include "mbedtls/net_sockets.h" #include "mbedtls/entropy.h" -- 2.39.2