Move the TLS resumption support from Experimental to mainline

[exim.git] / src / exim_monitor / em_version.c

diff --git a/src/exim_monitor/em_version.c b/src/exim_monitor/em_version.c
index ff9ac5c58578320904e2184fe5fb23856f1170b3..c5931fc8d6c667bd1b692aed6b8889caaf151bf6 100644 (file)
--- a/src/exim_monitor/em_version.c
+++ b/src/exim_monitor/em_version.c
@@ -3,9 +3,13 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */

+/* Copyright (c) The Exim Maintainers 2020 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* See the file NOTICE for conditions of use and distribution. */
 

+#define EM_VERSION_C
+

 #include "mytypes.h"
 #include "mytypes.h"

+#include "store.h"

 #include "macros.h"
 #include <string.h>
 #include <stdlib.h>
 #include "macros.h"
 #include <string.h>
 #include <stdlib.h>


@@ -33,7 +37,7 @@ version_date[0] = 0;
 Ustrncat(version_date, EXIM_BUILD_DATE_OVERRIDE, 31);
 
 #else
 Ustrncat(version_date, EXIM_BUILD_DATE_OVERRIDE, 31);
 
 #else

-Ustrcpy(today, __DATE__);
+Ustrcpy(today, US __DATE__);

 if (today[4] == ' ') i = 1;
 today[3] = today[6] = '-';
 
 if (today[4] == ' ') i = 1;
 today[3] = today[6] = '-';
 


@@ -42,8 +46,8 @@ version_date[0] = 0;
 Ustrncat(version_date, today+4+i, 3-i);
 Ustrncat(version_date, today, 4);
 Ustrncat(version_date, today+7, 4);
 Ustrncat(version_date, today+4+i, 3-i);
 Ustrncat(version_date, today, 4);
 Ustrncat(version_date, today+7, 4);

-Ustrcat(version_date, " ");
-Ustrcat(version_date, __TIME__);
+Ustrcat(version_date, US" ");
+Ustrcat(version_date, US __TIME__);

 #endif
 }
 
 #endif
 }