Unix buildinfo: stop saying 'GTK' in pure CLI utilities.

[PuTTY.git] / unix / unix.h

diff --git a/unix/unix.h b/unix/unix.h
index ea848d3744ace1499ffb514e61d19db00c2db658..7ab2ca24f229cbab0de48d9d8293c04d76b850e5 100644 (file)
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -31,21 +31,29 @@
 #define JUST_USE_GTK_CLIPBOARD_UTF8 /* low-level gdk_selection_* fails */
 #define DEFAULT_CLIPBOARD GDK_SELECTION_CLIPBOARD /* OS X has no PRIMARY */
 
-#define BUILDINFO_PLATFORM "OS X (GTK)"
+#define BUILDINFO_PLATFORM_GTK "OS X (GTK)"
 #define BUILDINFO_GTK
 
 #elif defined NOT_X_WINDOWS
 
-#define BUILDINFO_PLATFORM "Unix (pure GTK)"
+#define BUILDINFO_PLATFORM_GTK "Unix (pure GTK)"
 #define BUILDINFO_GTK
 
 #else
 
-#define BUILDINFO_PLATFORM "Unix (GTK + X11)"
+#define BUILDINFO_PLATFORM_GTK "Unix (GTK + X11)"
 #define BUILDINFO_GTK
 
 #endif
 
+/* BUILDINFO_PLATFORM varies its expansion between the GTK and
+ * pure-CLI utilities, so that Unix Plink, PSFTP etc don't announce
+ * themselves incongruously as having something to do with GTK. */
+#define BUILDINFO_PLATFORM_CLI "Unix"
+extern const int buildinfo_gtk_relevant;
+#define BUILDINFO_PLATFORM (buildinfo_gtk_relevant ? \
+                            BUILDINFO_PLATFORM_GTK : BUILDINFO_PLATFORM_CLI)
+
 char *buildinfo_gtk_version(void);
 
 struct Filename {