mirror of
https://git.freebsd.org/ports.git
synced 2025-05-14 08:11:50 -04:00
d124846683
After src snapshot 0c47b9c211e, the build began failing with:
../../third_party/nasm/include/compiler.h:249:21: error: static
declaration of 'mempcpy' follows non-static declaration
249 | static inline void *mempcpy(void *dst, const void *src, size_t n)
| ^
/usr/include/string.h:71:8: note: previous declaration is here
71 | void *(mempcpy)(void * __restrict,
const void * __restrict, size_t);
Fix the build by restoring a default definition of HAVE_MEMPCPY since
we have had mempcpy() since 13.1.
Approved by: kevans, mikael (maintainer)
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D46053
95 lines
3 KiB
C
95 lines
3 KiB
C
--- src/webrtc/src/third_party/nasm/config/config-linux.h.orig 2024-03-14 18:07:21 UTC
|
|
+++ src/webrtc/src/third_party/nasm/config/config-linux.h
|
|
@@ -160,7 +160,7 @@
|
|
|
|
/* Define to 1 if you have the declaration of `strlcpy', and to 0 if you
|
|
don't. */
|
|
-#define HAVE_DECL_STRLCPY 0
|
|
+#define HAVE_DECL_STRLCPY 1
|
|
|
|
/* Define to 1 if you have the declaration of `strncasecmp', and to 0 if you
|
|
don't. */
|
|
@@ -183,7 +183,7 @@
|
|
#define HAVE_DECL_STRSEP 1
|
|
|
|
/* Define to 1 if you have the <endian.h> header file. */
|
|
-#define HAVE_ENDIAN_H 1
|
|
+/* #undef HAVE_ENDIAN_H */
|
|
|
|
/* Define to 1 if you have the `faccessat' function. */
|
|
#define HAVE_FACCESSAT 1
|
|
@@ -327,10 +327,10 @@
|
|
#define HAVE_ISASCII 1
|
|
|
|
/* Define to 1 if you have the `iscntrl' function. */
|
|
-/* #undef HAVE_ISCNTRL */
|
|
+#define HAVE_ISCNTRL 1
|
|
|
|
/* Define to 1 if you have the <machine/endian.h> header file. */
|
|
-/* #undef HAVE_MACHINE_ENDIAN_H */
|
|
+#define HAVE_MACHINE_ENDIAN_H 1
|
|
|
|
/* Define to 1 if you have the <memory.h> header file. */
|
|
#define HAVE_MEMORY_H 1
|
|
@@ -357,7 +357,7 @@
|
|
#define HAVE_STDARG_H 1
|
|
|
|
/* Define to 1 if stdbool.h conforms to C99. */
|
|
-/* #undef HAVE_STDBOOL_H */
|
|
+#define HAVE_STDBOOL_H 1
|
|
|
|
/* Define to 1 if your compiler supports C99 extern inline */
|
|
#define HAVE_STDC_INLINE 1
|
|
@@ -384,7 +384,7 @@
|
|
#define HAVE_STRING_H 1
|
|
|
|
/* Define to 1 if you have the `strlcpy' function. */
|
|
-/* #undef HAVE_STRLCPY */
|
|
+#define HAVE_STRLCPY 1
|
|
|
|
/* Define to 1 if you have the `strncasecmp' function. */
|
|
#define HAVE_STRNCASECMP 1
|
|
@@ -411,7 +411,7 @@
|
|
#define HAVE_SYSCONF 1
|
|
|
|
/* Define to 1 if you have the <sys/endian.h> header file. */
|
|
-/* #undef HAVE_SYS_ENDIAN_H */
|
|
+#define HAVE_SYS_ENDIAN_H 1
|
|
|
|
/* Define to 1 if you have the <sys/mman.h> header file. */
|
|
#define HAVE_SYS_MMAN_H 1
|
|
@@ -486,13 +486,13 @@
|
|
/* #undef HAVE__STATI64 */
|
|
|
|
/* Define to 1 if you have the `__bswap_16' intrinsic function. */
|
|
-#define HAVE___BSWAP_16 1
|
|
+/* #undef HAVE___BSWAP_16 */
|
|
|
|
/* Define to 1 if you have the `__bswap_32' intrinsic function. */
|
|
-#define HAVE___BSWAP_32 1
|
|
+/* #undef HAVE___BSWAP_32 */
|
|
|
|
/* Define to 1 if you have the `__bswap_64' intrinsic function. */
|
|
-#define HAVE___BSWAP_64 1
|
|
+/* #undef HAVE___BSWAP_64 */
|
|
|
|
/* Define to 1 if you have the `__builtin_bswap16' intrinsic function. */
|
|
#define HAVE___BUILTIN_BSWAP16 1
|
|
@@ -620,7 +620,7 @@
|
|
/* Define to the equivalent of the C99 'restrict' keyword, or to
|
|
nothing if this is not supported. Do not define if restrict is
|
|
supported directly. */
|
|
-#define restrict __restrict
|
|
+#define restrict __restrict__
|
|
/* Work around a bug in Sun C++: it does not support _Restrict or
|
|
__restrict__, even though the corresponding Sun C compiler ends up with
|
|
"#define restrict _Restrict" or "#define restrict __restrict__" in the
|
|
@@ -637,7 +637,7 @@
|
|
/* Define if your snprintf function is not named snprintf. */
|
|
/* #undef snprintf */
|
|
|
|
-/* Define if your typeof operator is not named typeof. */
|
|
+/* Define if your typeof operator is not named `typeof'. */
|
|
#define typeof __typeof
|
|
|
|
/* Define to the type of an unsigned integer type wide enough to hold a
|