Opened 5 years ago

Closed 5 years ago

#14220 closed defect (fixed)

Suppress warnings for dual declaration in srtp.h

Reported by: nickm Owned by:
Priority: Medium Milestone: Tor: 0.2.5.x-final
Component: Core Tor/Tor Version:
Severity: Keywords:
Cc: Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

OpenSSL has a function declared twice in the srtp.h header.

18:36:32 In file included from /srv/jenkins-workspace/workspace/tor-ci-mingwcross-0.2.5/ARCHITECTURE/i386/SUITE/jessie/UPSTREAM/include/openssl/ssl.h:1392:0,
18:36:32                  from src/common/tortls.c:36:
18:36:32 /srv/jenkins-workspace/workspace/tor-ci-mingwcross-0.2.5/ARCHITECTURE/i386/SUITE/jessie/UPSTREAM/include/openssl/srtp.h:142:26: error: redundant redeclaration of 'SSL_get_selected_srtp_profile' [-Werror=redundant-decls]
18:36:32  SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s);
18:36:32                           ^
18:36:32 /srv/jenkins-workspace/workspace/tor-ci-mingwcross-0.2.5/ARCHITECTURE/i386/SUITE/jessie/UPSTREAM/include/openssl/srtp.h:139:26: note: previous declaration of 'SSL_get_selected_srtp_profile' was here
18:36:32  SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s);
18:36:32                           ^
18:36:33 cc1: all warnings being treated as errors

I fixed this warning in master but it should get a changes file, so I'm giving it a bug number.

Child Tickets

Change History (1)

comment:1 Changed 5 years ago by nickm

Milestone: Tor: 0.2.5.x-final
Resolution: fixed
Status: newclosed

Applied to 0.2.5, and merged the changes file forward.

Note: See TracTickets for help on using tickets.