remove cdefs.h from fts.h

chimera-linux · Sep 29, 2024 · edbe64d · edbe64d
1 parent 083278c
commit edbe64d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/patches/src.freebsd.patch b/patches/src.freebsd.patch
@@ -11040,7 +11040,20 @@
  	unsigned fts_flags;		/* private flags for FTSENT structure */
 
  #define	FTS_AGAIN	 1		/* read node again */
-@@ -128,10 +140,14 @@
+@@ -118,9 +130,10 @@
+ 	FTS *fts_fts;			/* back pointer to main FTS */
+ } FTSENT;
+
+-#include <sys/cdefs.h>
++#ifdef __cplusplus
++extern "C" {
++#endif
+
+-__BEGIN_DECLS
+ FTSENT	*fts_children(FTS *, int);
+ int	 fts_close(FTS *);
+ void	*fts_get_clientptr(FTS *);
+@@ -128,10 +141,17 @@
  FTS	*fts_get_stream(FTSENT *);
  #define	 fts_get_stream(ftsent)	((ftsent)->fts_fts)
  FTS	*fts_open(char * const *, int,
@@ -11049,7 +11062,11 @@
  FTSENT	*fts_read(FTS *);
  int	 fts_set(FTS *, FTSENT *, int);
  void	 fts_set_clientptr(FTS *, void *);
- __END_DECLS
+-__END_DECLS
++
++#ifdef __cplusplus
++}
++#endif
 +
 +#else
 +#  include_next <fts.h>

diff --git a/src.freebsd/include/fts.h b/src.freebsd/include/fts.h
@@ -130,9 +130,10 @@ typedef struct _ftsent {
 	FTS *fts_fts;			/* back pointer to main FTS */
 } FTSENT;
 
-#include <sys/cdefs.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-__BEGIN_DECLS
 FTSENT	*fts_children(FTS *, int);
 int	 fts_close(FTS *);
 void	*fts_get_clientptr(FTS *);
@@ -144,7 +145,10 @@ FTS	*fts_open(char * const *, int,
 FTSENT	*fts_read(FTS *);
 int	 fts_set(FTS *, FTSENT *, int);
 void	 fts_set_clientptr(FTS *, void *);
-__END_DECLS
+
+#ifdef __cplusplus
+}
+#endif
 
 #else
 #  include_next <fts.h>