TeamHepta/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-04-09 22:03:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4502 from d3zd3z/bp216-posix-define

Browse Source 
Backport 2.16: Check if feature macro is defined before define it
This commit is contained in:
Gilles Peskine
2021-05-17 12:10:07 +02:00
committed by GitHub
parent f2fa6e54a7 6e57cb9d5d
commit 6c0f91ec00
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog.d/posix-define.txt Normal file
View File

@@ -0,0 +1,6 @@
Bugfix
* In library/net_sockets.c, _POSIX_C_SOURCE and _XOPEN_SOURCE are
defined to specific values. If the code is used in a context
where these are already defined, this can result in a compilation
error. Instead, assume that if they are defined, the values will
be adequate to build Mbed TLS.

4
library/net_sockets.c
View File

@@ -47,11 +47,15 @@
/* Enable definition of getaddrinfo() even when compiling with -std=c99. Must
* be set before config.h, which pulls in glibc's features.h indirectly.
* Harmless on other platforms. */
#ifndef _POSIX_C_SOURCE
#define _POSIX_C_SOURCE 200112L
#endif
#if defined(__NetBSD__)
#ifndef _XOPEN_SOURCE
#define _XOPEN_SOURCE 600 /* sockaddr_storage */
#endif
#endif
#if !defined(MBEDTLS_CONFIG_FILE)
#include "mbedtls/config.h"