mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-05-02 17:48:27 +02:00
175895ac5c
To many issues, and it blocks us. Lets revert it again til issues are fixed upstream. This reverts commit27c6143971. This reverts commiteb4c10b9c6. This reverts commit0920eac441. This reverts commitbd6dc56ca9. This reverts commit52fd5614b7.
144 lines
3.7 KiB
Diff
144 lines
3.7 KiB
Diff
From 85afbd3d5a11b48a2d0fa77bcefab20c2f9f5292 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Kolesa <daniel@octaforge.org>
|
|
Date: Tue, 1 Nov 2022 01:03:48 +0100
|
|
Subject: [PATCH] avoid __extension__ with clang
|
|
|
|
It seems useless and triggers 'error: expected external declaration'
|
|
---
|
|
include/poll.h | 2 +-
|
|
include/stdio.h | 2 +-
|
|
include/stdlib.h | 4 ++--
|
|
include/string.h | 2 +-
|
|
include/sys/select.h | 2 +-
|
|
include/sys/socket.h | 2 +-
|
|
include/unistd.h | 2 +-
|
|
include/wchar.h | 8 ++++----
|
|
8 files changed, 12 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/include/poll.h b/include/poll.h
|
|
index 60a7623..b8d5c0b 100644
|
|
--- a/include/poll.h
|
|
+++ b/include/poll.h
|
|
@@ -17,7 +17,7 @@
|
|
#ifndef _FORTIFY_POLL_H
|
|
#define _FORTIFY_POLL_H
|
|
|
|
-#ifndef __cplusplus
|
|
+#if !defined(__cplusplus) && !defined(__clang__)
|
|
__extension__
|
|
#endif
|
|
#include_next <poll.h>
|
|
diff --git a/include/stdio.h b/include/stdio.h
|
|
index e50f65f..a5aaa8f 100644
|
|
--- a/include/stdio.h
|
|
+++ b/include/stdio.h
|
|
@@ -17,7 +17,7 @@
|
|
#ifndef _FORTIFY_STDIO_H
|
|
#define _FORTIFY_STDIO_H
|
|
|
|
-#ifndef __cplusplus
|
|
+#if !defined(__cplusplus) && !defined(__clang__)
|
|
__extension__
|
|
#endif
|
|
#include_next <stdio.h>
|
|
diff --git a/include/stdlib.h b/include/stdlib.h
|
|
index 2b854d0..c43a835 100644
|
|
--- a/include/stdlib.h
|
|
+++ b/include/stdlib.h
|
|
@@ -17,14 +17,14 @@
|
|
#ifndef _FORTIFY_STDLIB_H
|
|
#define _FORTIFY_STDLIB_H
|
|
|
|
-#ifndef __cplusplus
|
|
+#if !defined(__cplusplus) && !defined(__clang__)
|
|
__extension__
|
|
#endif
|
|
#include_next <stdlib.h>
|
|
|
|
#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
|
|
#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
|
|
-#ifndef __cplusplus
|
|
+#if !defined(__cplusplus) && !defined(__clang__)
|
|
__extension__
|
|
#endif
|
|
#include_next <limits.h>
|
|
diff --git a/include/string.h b/include/string.h
|
|
index 9d4658c..834d262 100644
|
|
--- a/include/string.h
|
|
+++ b/include/string.h
|
|
@@ -17,7 +17,7 @@
|
|
#ifndef _FORTIFY_STRING_H
|
|
#define _FORTIFY_STRING_H
|
|
|
|
-#ifndef __cplusplus
|
|
+#if !defined(__cplusplus) && !defined(__clang__)
|
|
__extension__
|
|
#endif
|
|
#include_next <string.h>
|
|
diff --git a/include/sys/select.h b/include/sys/select.h
|
|
index 527d8e4..75c4829 100644
|
|
--- a/include/sys/select.h
|
|
+++ b/include/sys/select.h
|
|
@@ -17,7 +17,7 @@
|
|
#ifndef _FORTIFY_SYS_SELECT_H
|
|
#define _FORTIFY_SYS_SELECT_H
|
|
|
|
-#ifndef __cplusplus
|
|
+#if !defined(__cplusplus) && !defined(__clang__)
|
|
__extension__
|
|
#endif
|
|
#include_next <sys/select.h>
|
|
diff --git a/include/sys/socket.h b/include/sys/socket.h
|
|
index 02cad5f..5a1821c 100644
|
|
--- a/include/sys/socket.h
|
|
+++ b/include/sys/socket.h
|
|
@@ -17,7 +17,7 @@
|
|
#ifndef _FORTIFY_SYS_SOCKET_H
|
|
#define _FORTIFY_SYS_SOCKET_H
|
|
|
|
-#ifndef __cplusplus
|
|
+#if !defined(__cplusplus) && !defined(__clang__)
|
|
__extension__
|
|
#endif
|
|
#include_next <sys/socket.h>
|
|
diff --git a/include/unistd.h b/include/unistd.h
|
|
index 9f8a187..d36dfc4 100644
|
|
--- a/include/unistd.h
|
|
+++ b/include/unistd.h
|
|
@@ -17,7 +17,7 @@
|
|
#ifndef _FORTIFY_UNISTD_H
|
|
#define _FORTIFY_UNISTD_H
|
|
|
|
-#ifndef __cplusplus
|
|
+#if !defined(__cplusplus) && !defined(__clang__)
|
|
__extension__
|
|
#endif
|
|
#include_next <unistd.h>
|
|
diff --git a/include/wchar.h b/include/wchar.h
|
|
index 41423a8..e359452 100644
|
|
--- a/include/wchar.h
|
|
+++ b/include/wchar.h
|
|
@@ -17,19 +17,19 @@
|
|
#ifndef _FORTIFY_WCHAR_H
|
|
#define _FORTIFY_WCHAR_H
|
|
|
|
-#ifndef __cplusplus
|
|
+#if !defined(__cplusplus) && !defined(__clang__)
|
|
__extension__
|
|
#endif
|
|
#include_next <limits.h>
|
|
-#ifndef __cplusplus
|
|
+#if !defined(__cplusplus) && !defined(__clang__)
|
|
__extension__
|
|
#endif
|
|
#include_next <stdlib.h>
|
|
-#ifndef __cplusplus
|
|
+#if !defined(__cplusplus) && !defined(__clang__)
|
|
__extension__
|
|
#endif
|
|
#include_next <string.h>
|
|
-#ifndef __cplusplus
|
|
+#if !defined(__cplusplus) && !defined(__clang__)
|
|
__extension__
|
|
#endif
|
|
#include_next <wchar.h>
|