Remove pointless redefinition of 'privoxy_mutex_t'
authorFabian Keil <fk@fabiankeil.de>
Sat, 19 Dec 2020 15:55:02 +0000 (16:55 +0100)
committerFabian Keil <fk@fabiankeil.de>
Mon, 21 Dec 2020 07:10:17 +0000 (08:10 +0100)
... 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

index 14b957f..44b62d1 100644 (file)
--- a/project.h
+++ b/project.h
 #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"