Page MenuHomeFreeBSD
Files F167682423

D58842.id184062.diff
No OneTemporary
Actions

D58842.id184062.diff
View Options

diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -332,7 +332,7 @@
extern void xdrmem_create(XDR *, char *, u_int, enum xdr_op);
/* XDR using stdio library */
-#ifdef _STDIO_H_
+#ifdef __STDC_VERSION_STDIO_H__
extern void xdrstdio_create(XDR *, FILE *, enum xdr_op);
#endif
diff --git a/include/stdio.h b/include/stdio.h
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -32,8 +32,8 @@
* SUCH DAMAGE.
*/
-#ifndef _STDIO_H_
-#define _STDIO_H_
+#ifndef __STDC_VERSION_STDIO_H__
+#define __STDC_VERSION_STDIO_H__ 202311L
#include <sys/cdefs.h>
#include <sys/_null.h>
@@ -220,6 +220,10 @@
#endif
#define FILENAME_MAX 1024 /* must be <= PATH_MAX <sys/syslimits.h> */
+#if __ISO_C_VISIBLE >= 2023
+#define _PRINTF_NAN_LEN_MAX 3
+#endif
+
/* System V/ANSI C; this is the wrong way to do this, do *not* use these. */
#if __XSI_VISIBLE
#define P_tmpdir "/tmp/"
@@ -536,4 +540,4 @@
__END_DECLS
__NULLABILITY_PRAGMA_POP
-#endif /* !_STDIO_H_ */
+#endif /* !__STDC_VERSION_STDIO_H__ */
diff --git a/include/xlocale.h b/include/xlocale.h
--- a/include/xlocale.h
+++ b/include/xlocale.h
@@ -68,7 +68,7 @@
#include <xlocale/_ctype.h>
#endif
-#ifdef _STDIO_H_
+#ifdef __STDC_VERSION_STDIO_H__
#include <xlocale/_stdio.h>
#endif
diff --git a/lib/libc/xdr/xdr.3 b/lib/libc/xdr/xdr.3
--- a/lib/libc/xdr/xdr.3
+++ b/lib/libc/xdr/xdr.3
@@ -572,7 +572,7 @@
using filter
.Fa func .
.Pp
-.It Li "#ifdef _STDIO_H_"
+.It Li "#ifdef __STDC_VERSION_STDIO_H__"
.It Li "/* XDR using stdio library */"
.It Xo
.Ft void
diff --git a/lib/libgeom/libgeom.h b/lib/libgeom/libgeom.h
--- a/lib/libgeom/libgeom.h
+++ b/lib/libgeom/libgeom.h
@@ -143,7 +143,7 @@
struct gctl_req;
-#ifdef _STDIO_H_ /* limit #include pollution */
+#ifdef __STDC_VERSION_STDIO_H__ /* limit #include pollution */
void gctl_dump(struct gctl_req *, FILE *);
#endif
void gctl_free(struct gctl_req *);
diff --git a/lib/libutil/libutil.h b/lib/libutil/libutil.h
--- a/lib/libutil/libutil.h
+++ b/lib/libutil/libutil.h
@@ -151,7 +151,7 @@
* Conditionally prototype the following functions if the include
* files upon which they depend have been included.
*/
-#ifdef _STDIO_H_
+#ifdef __STDC_VERSION_STDIO_H__
char *fparseln(FILE *_fp, size_t *_len, size_t *_lineno,
const char _delim[3], int _flags);
#endif
diff --git a/stand/libsa/geli/geliboot_internal.h b/stand/libsa/geli/geliboot_internal.h
--- a/stand/libsa/geli/geliboot_internal.h
+++ b/stand/libsa/geli/geliboot_internal.h
@@ -28,9 +28,15 @@
#ifndef _GELIBOOT_INTERNAL_H_
#define _GELIBOOT_INTERNAL_H_
+/*
+ * XXX:
+ * The following deliberate defines are to keep g_eli.h from including
+ * unnecessary headers. It would be preferable to conditionally include
+ * them in a _STANDALONE branch there instead.
+ */
#define _STRING_H_
#define _STRINGS_H_
-#define _STDIO_H_
+#define __STDC_VERSION_STDIO_H__ 202311L
#include <sys/endian.h>
#include <sys/queue.h>

File Metadata

Mime Type
text/plain
Expires
Mon, Aug 24, 6:12 PM (6 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37198294
Default Alt Text
D58842.id184062.diff (2 KB)

Event Timeline