summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorscuri <scuri>2008-12-11 19:02:42 +0000
committerscuri <scuri>2008-12-11 19:02:42 +0000
commit97e124186670ae2dfc879082f44a8d9d72a1388c (patch)
treecef805bfcff91dbd5bbbdceed4619bdce8c344e7 /src
parent86a2d6977465369d89ae20b0bcebf848f31bdade (diff)
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r--src/cd.c13
-rw-r--r--src/lua5/cdlua5.c4
2 files changed, 10 insertions, 7 deletions
diff --git a/src/cd.c b/src/cd.c
index 536f7ef..c8425ba 100644
--- a/src/cd.c
+++ b/src/cd.c
@@ -17,18 +17,21 @@
#include "cd_private.h"
#include "cdirgb.h"
+/* This appears only here to avoid changing the cd.h header fo bug fixes */
+#define CD_VERSION_FIX ".1"
+#define CD_VERSION_FIX_NUMBER 1
const char cd_ident[] =
- "$CD: " CD_VERSION " " CD_COPYRIGHT " $\n"
+ "$CD: " CD_VERSION CD_VERSION_FIX " " CD_COPYRIGHT " $\n"
"$URL: www.tecgraf.puc-rio.br/cd $\n";
-static char *tecver = "TECVERID.str:CD:LIB:"CD_VERSION;
+static char *tecver = "TECVERID.str:CD:LIB:" CD_VERSION CD_VERSION_FIX;
char* cdVersion(void)
{
(void)cd_ident;
(void)tecver;
- return CD_VERSION;
+ return CD_VERSION CD_VERSION_FIX;
}
char* cdVersionDate(void)
@@ -38,7 +41,7 @@ char* cdVersionDate(void)
int cdVersionNumber(void)
{
- return CD_VERSION_NUMBER;
+ return CD_VERSION_NUMBER+CD_VERSION_FIX_NUMBER;
}
static void cd_setdefaultfunc(cdCanvas* canvas)
@@ -128,7 +131,7 @@ cdCanvas *cdCreateCanvas(cdContext* context, void *data_str)
char* env = getenv("CD_QUIET");
if (first && env && strcmp(env, "NO")==0)
{
- printf("CD "CD_VERSION" "CD_COPYRIGHT"\n");
+ printf("CD " CD_VERSION CD_VERSION_FIX " " CD_COPYRIGHT "\n");
first = 0;
}
}
diff --git a/src/lua5/cdlua5.c b/src/lua5/cdlua5.c
index db22422..7b7b617 100644
--- a/src/lua5/cdlua5.c
+++ b/src/lua5/cdlua5.c
@@ -1763,7 +1763,7 @@ static void setinfo (lua_State *L)
lua_settable (L, -3);
lua_pushliteral (L, "_VERSION");
- lua_pushliteral (L, CD_VERSION);
+ lua_pushstring (L, cdVersion());
lua_settable (L, -3);
lua_pushliteral (L, "_VERSION_DATE");
@@ -1771,7 +1771,7 @@ static void setinfo (lua_State *L)
lua_settable (L, -3);
lua_pushliteral (L, "_VERSION_NUMBER");
- lua_pushinteger(L, CD_VERSION_NUMBER);
+ lua_pushinteger(L, cdVersionNumber());
lua_settable (L, -3);
}