diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-02-05 07:16:19 +0100 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-02-05 07:16:19 +0100 |
commit | 395be9a8fb85d172dcbb06826aed8b5b29ceeac2 (patch) | |
tree | 3ffbb3918316368c4400a34393e9febddc6bbad6 /src/include | |
parent | 7c469133a0692a20ea4db3f91a9a12b2a1a448be (diff) | |
download | gnunet-395be9a8fb85d172dcbb06826aed8b5b29ceeac2.tar.gz gnunet-395be9a8fb85d172dcbb06826aed8b5b29ceeac2.zip |
- Fix build of ats transport plugin not linking against libgnunetnt
- Add compat memrchr layer for Win32 and macOS
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/compat.h | 54 | ||||
-rw-r--r-- | src/include/platform.h | 4 |
2 files changed, 58 insertions, 0 deletions
diff --git a/src/include/compat.h b/src/include/compat.h new file mode 100644 index 000000000..31a9760c5 --- /dev/null +++ b/src/include/compat.h | |||
@@ -0,0 +1,54 @@ | |||
1 | /* | ||
2 | This file is part of GNUnet. | ||
3 | Copyright (C) 2001, 2002, 2003, 2004, 2005 GNUnet e.V. | ||
4 | |||
5 | GNUnet is free software: you can redistribute it and/or modify it | ||
6 | under the terms of the GNU Affero General Public License as published | ||
7 | by the Free Software Foundation, either version 3 of the License, | ||
8 | or (at your option) any later version. | ||
9 | |||
10 | GNUnet is distributed in the hope that it will be useful, but | ||
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
13 | Affero General Public License for more details. | ||
14 | |||
15 | You should have received a copy of the GNU Affero General Public License | ||
16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
17 | |||
18 | SPDX-License-Identifier: AGPL3.0-or-later | ||
19 | */ | ||
20 | |||
21 | /** | ||
22 | * @author Martin Schanzenbach | ||
23 | * | ||
24 | * @file include/compat.h | ||
25 | * Definitions for macOS and Win32 | ||
26 | */ | ||
27 | |||
28 | #ifndef _COMPAT_H | ||
29 | #define _COMPAT_H | ||
30 | |||
31 | #ifdef __cplusplus | ||
32 | extern "C" | ||
33 | { | ||
34 | #endif | ||
35 | |||
36 | /** | ||
37 | * memrchr as defined in glibc | ||
38 | * | ||
39 | * @param s pointer to memory | ||
40 | * @param c character to search for | ||
41 | * @param n search character limit | ||
42 | */ | ||
43 | void* | ||
44 | GN_memrchr_ (const void *s, | ||
45 | int c, | ||
46 | size_t n); | ||
47 | |||
48 | #define memrchr(s,c,n) GN_memrchr_(s,c,n) | ||
49 | |||
50 | #ifdef __cplusplus | ||
51 | } | ||
52 | #endif | ||
53 | |||
54 | #endif | ||
diff --git a/src/include/platform.h b/src/include/platform.h index e12c49888..b0a7c0a47 100644 --- a/src/include/platform.h +++ b/src/include/platform.h | |||
@@ -70,6 +70,10 @@ | |||
70 | 70 | ||
71 | #define VERBOSE_STATS 0 | 71 | #define VERBOSE_STATS 0 |
72 | 72 | ||
73 | #if (defined WINDOWS) || (defined DARWIN) | ||
74 | #include "compat.h" | ||
75 | #endif | ||
76 | |||
73 | #ifdef CYGWIN | 77 | #ifdef CYGWIN |
74 | #include <sys/reent.h> | 78 | #include <sys/reent.h> |
75 | #endif | 79 | #endif |