From f0950abbf7cfc099ab5d27ce8f863c2bcb47e6db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Sat, 27 Mar 1999 18:17:00 +0100
Subject: [PATCH] Now uses version.h for the __VERSION__ macro. Added
__MAJOR__, __MINOR__ and __BUILD__ macros.
Rev: src/cpp.c:1.50
---
src/cpp.c | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/cpp.c b/src/cpp.c
index 0a8f9fe921..993c72d61f 100644
--- a/src/cpp.c
+++ b/src/cpp.c
@@ -5,7 +5,7 @@
\*/
/*
- * $Id: cpp.c,v 1.49 1999/03/09 00:07:51 grubba Exp $
+ * $Id: cpp.c,v 1.50 1999/03/27 17:17:00 grubba Exp $
*/
#include "global.h"
#include "language.h"
@@ -27,6 +27,8 @@
#include "constants.h"
#include "time.h"
#include "stuff.h"
+#include "version.h"
+
#include <ctype.h>
#define CPP_NO_OUTPUT 1
@@ -1110,14 +1112,26 @@ void f_cpp(INT32 args)
this.defines=hash_insert(this.defines, & def->link);
}
- simple_add_define(&this,"__PIKE__"," 1 ");
- simple_add_define(&this,"__VERSION__"," 0.7 ");
+ {
+ char buffer[128];
+
+ simple_add_define(&this, "__PIKE__", " 1 ");
+
+ sprintf(buffer, " %d.%d ", PIKE_MAJOR_VERSION, PIKE_MINOR_VERSION);
+ simple_add_define(&this, "__VERSION__", buffer);
+ sprintf(buffer, " %d ", PIKE_MAJOR_VERSION);
+ simple_add_define(&this, "__MAJOR__", buffer);
+ sprintf(buffer, " %d ", PIKE_MINOR_VERSION);
+ simple_add_define(&this, "__MINOR__", buffer);
+ sprintf(buffer, " %d ", PIKE_BUILD_VERSION);
+ simple_add_define(&this, "__BUILD__", buffer);
#ifdef __NT__
- simple_add_define(&this,"__NT__"," 1 ");
+ simple_add_define(&this, "__NT__", " 1 ");
#endif
#ifdef __amigaos__
- simple_add_define(&this,"__amigaos__"," 1 ");
+ simple_add_define(&this, "__amigaos__", " 1 ");
#endif
+ }
for (tmpf=pike_predefs; tmpf; tmpf=tmpf->next)
simple_add_define(&this, tmpf->name, tmpf->value);
--
GitLab