Factor out the increasingly complicated SSH-2 channel structure initialisation

[sgt/putty] / version.c

diff --git a/version.c b/version.c
index c39709c..de65867 100644 (file)
--- a/version.c
+++ b/version.c
@@ -7,14 +7,27 @@
 
 #if defined SNAPSHOT
 
-char ver[] = "Development snapshot " STR(SNAPSHOT);
-char sshver[] = "PuTTY-Snapshot-" STR(SNAPSHOT);
+#if defined SVN_REV
+#define SNAPSHOT_TEXT STR(SNAPSHOT) ":r" STR(SVN_REV)
+#else
+#define SNAPSHOT_TEXT STR(SNAPSHOT)
+#endif
+
+char ver[] = "Development snapshot " SNAPSHOT_TEXT;
+char sshver[] = "PuTTY-Snapshot-" SNAPSHOT_TEXT;
+
+#undef SNAPSHOT_TEXT
 
 #elif defined RELEASE
 
 char ver[] = "Release " STR(RELEASE);
 char sshver[] = "PuTTY-Release-" STR(RELEASE);
 
+#elif defined SVN_REV
+
+char ver[] = "Custom build r" STR(SVN_REV);
+char sshver[] = "PuTTY-Custom-r" STR(SVN_REV);
+
 #else
 
 char ver[] = "Unidentified build, " __DATE__ " " __TIME__;