[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Gavin D. Smith |
Date: |
Mon, 23 Dec 2024 09:47:47 -0500 (EST) |
branch: master
commit d71119eb14dadd244bf1c8af718a60a426979059
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Mon Dec 23 14:31:04 2024 +0000
Remove or move system.h defines.
* system.h (TEXINFO_PRINTFLIKE): Remove.
* info/info.h (TEXINFO_PRINTFLIKE): Add.
---
ChangeLog | 7 +++++++
info/info.h | 8 ++++++++
system.h | 8 --------
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 81c77e83ff..35c5ceda32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-12-23 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove or move system.h defines.
+
+ * system.h (TEXINFO_PRINTFLIKE): Remove.
+ * info/info.h (TEXINFO_PRINTFLIKE): Add.
+
2024-12-23 Gavin Smith <gavinsmith0123@gmail.com>
Remove or move system.h defines.
diff --git a/info/info.h b/info/info.h
index 66259d7689..69f49106a1 100644
--- a/info/info.h
+++ b/info/info.h
@@ -25,6 +25,14 @@
#define STREQ(s1,s2) (strcmp (s1, s2) == 0)
+#ifndef TEXINFO_PRINTFLIKE
+# ifdef __GNUC__
+# define TEXINFO_PRINTFLIKE(fmt,narg) __attribute__ ((__format__ (__printf__,
fmt, narg)))
+# else
+# define TEXINFO_PRINTFLIKE(fmt,narg)
+# endif
+#endif
+
struct window_struct;
typedef void COMMAND_FUNCTION (struct window_struct *window, int count);
diff --git a/system.h b/system.h
index 2a392280b3..c7d1acafdf 100644
--- a/system.h
+++ b/system.h
@@ -173,12 +173,4 @@ extern int kill (pid_t, int);
/* Some systems don't declare this function in pwd.h. */
struct passwd *getpwnam (const char *name);
-#ifndef TEXINFO_PRINTFLIKE
-# ifdef __GNUC__
-# define TEXINFO_PRINTFLIKE(fmt,narg) __attribute__ ((__format__ (__printf__,
fmt, narg)))
-# else
-# define TEXINFO_PRINTFLIKE(fmt,narg)
-# endif
-#endif
-
#endif /* TEXINFO_SYSTEM_H */