[Privoxy-commits] [privoxy] branch master updated: Remove pointless redefinition of 'privoxy_mutex_t'

User Git git at git.privoxy.org
Mon Dec 21 07:11:53 UTC 2020


This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch master
in repository privoxy.

The following commit(s) were added to refs/heads/master by this push:
     new a16ace2a Remove pointless redefinition of 'privoxy_mutex_t'
a16ace2a is described below

commit a16ace2a46933dd2f7b9289ea1a98bff2756eea3
Author: Fabian Keil <fk at fabiankeil.de>
AuthorDate: Sat Dec 19 16:55:02 2020 +0100

    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 <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"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Privoxy-commits mailing list