Merge branch 'master' of git://git.exim.org/exim

[users/jgh/exim.git] / src / src / version.c

diff --git a/src/src/version.c b/src/src/version.c
index 11e50e5acf84f6d614b1eebba40377574c43fde3..ef994a893af73848d0d2806b7bf1efadc9c5daa9 100644 (file)
--- a/src/src/version.c
+++ b/src/src/version.c
@@ -1,18 +1,17 @@
-/* $Cambridge: exim/src/src/version.c,v 1.15 2006/04/04 09:48:50 ph10 Exp $ */
+/* $Cambridge: exim/src/src/version.c,v 1.29 2010/01/04 19:35:50 nm4 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2006 */
+/* Copyright (c) University of Cambridge 1995 - 2009 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Function for setting up the version string. */
 
 #include "exim.h"
 
-
-#define THIS_VERSION  "4.61"
+#include "version.h"
 
 
 /* The header file cnumber.h contains a single line containing the
@@ -41,7 +40,7 @@ sprintf() call is the gcc -Wall warns about a \0 in a format string. */
 version_cnumber = cnumber_buffer;
 version_cnumber_format = US"%d\0<<eximcnumber>>";
 sprintf(CS version_cnumber, CS version_cnumber_format, cnumber);
-version_string = US THIS_VERSION "\0<<eximversion>>";
+version_string = US EXIM_VERSION_STR "\0<<eximversion>>";
 
 Ustrcpy(today, __DATE__);
 if (today[4] == ' ') today[4] = '0';