From: Fabian Keil <fk@fabiankeil.de>
Date: Sat, 19 Dec 2020 15:55:02 +0000 (+0100)
Subject: Remove pointless redefinition of 'privoxy_mutex_t'
X-Git-Tag: v_3_0_30~187
X-Git-Url: http://www.privoxy.org/gitweb/@default-cgi@/faq/@default-cgi@toggle?a=commitdiff_plain;h=a16ace2a46933dd2f7b9289ea1a98bff2756eea3;p=privoxy.git
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.
---
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 <pthread.h>
- typedef pthread_mutex_t privoxy_mutex_t;
-#else
-# ifdef _WIN32
-# include <winsock2.h>
- /* without winsock2.h I get lots of compiler warnings about
- * #warning Please include winsock2.h before windows.h
- */
-# include <windows.h>
-# endif
- typedef CRITICAL_SECTION privoxy_mutex_t;
-#endif
-
#ifdef FEATURE_HTTPS_INSPECTION_MBEDTLS
#include "mbedtls/net_sockets.h"
#include "mbedtls/entropy.h"