summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrius Bentkus <andrius.bentkus@gmail.com>2015-06-25 11:14:00 +0200
committerAndrius Bentkus <andrius.bentkus@gmail.com>2015-06-25 17:31:34 +0200
commit06b355f5a97bd5fb19cfad7e8065d5e8a6c37bce (patch)
tree3b658b774f028c7a0b9962411a4a6a3e21850b42
parent2f945071616d226296068e3c61b6de2e64c813cf (diff)
Changed version variables to functions.
This is easier to access using ffi, since some languages, like C# like to use only function interfaces for accessing library functionality. fixes #60
-rw-r--r--api_test/main.c4
-rw-r--r--man/man3/cmark.318
-rw-r--r--src/cmark.c11
-rw-r--r--src/cmark.h4
4 files changed, 16 insertions, 21 deletions
diff --git a/api_test/main.c b/api_test/main.c
index 666af4d..104371c 100644
--- a/api_test/main.c
+++ b/api_test/main.c
@@ -55,8 +55,8 @@ test_continuation_byte(test_batch_runner *runner, const char *utf8);
static void
version(test_batch_runner *runner)
{
- INT_EQ(runner, cmark_version, CMARK_VERSION, "cmark_version");
- STR_EQ(runner, cmark_version_string, CMARK_VERSION_STRING,
+ INT_EQ(runner, cmark_version(), CMARK_VERSION, "cmark_version");
+ STR_EQ(runner, cmark_version_string(), CMARK_VERSION_STRING,
"cmark_version_string");
}
diff --git a/man/man3/cmark.3 b/man/man3/cmark.3
index aa254b0..6edac7b 100644
--- a/man/man3/cmark.3
+++ b/man/man3/cmark.3
@@ -1,4 +1,4 @@
-.TH cmark 3 "June 16, 2015" "LOCAL" "Library Functions Manual"
+.TH cmark 3 "June 25, 2015" "LOCAL" "Library Functions Manual"
.SH
NAME
.PP
@@ -556,13 +556,7 @@ sequences with the replacement character U+FFFD.
Version information
.PP
-.nf
-\fC
-.RS 0n
-extern const int cmark_version;
-.RE
-\f[]
-.fi
+\fIint\f[] \fBcmark_version\f[](\fI\f[])
.PP
The library version as integer for runtime checks. Also available as
@@ -577,13 +571,7 @@ Bits 0\-7 contain the patchlevel.
In hexadecimal format, the number 0x010203 represents version 1.2.3.
.PP
-.nf
-\fC
-.RS 0n
-extern const char cmark_version_string[];
-.RE
-\f[]
-.fi
+\fIconst char *\f[] \fBcmark_version_string\f[](\fI\f[])
.PP
The library version string for runtime checks. Also available as
diff --git a/src/cmark.c b/src/cmark.c
index 35765b1..ca9807b 100644
--- a/src/cmark.c
+++ b/src/cmark.c
@@ -6,8 +6,15 @@
#include "cmark.h"
#include "buffer.h"
-const int cmark_version = CMARK_VERSION;
-const char cmark_version_string[] = CMARK_VERSION_STRING;
+int cmark_version()
+{
+ return CMARK_VERSION;
+}
+
+const char *cmark_version_string()
+{
+ return CMARK_VERSION_STRING;
+}
char *cmark_markdown_to_html(const char *text, size_t len, int options)
{
diff --git a/src/cmark.h b/src/cmark.h
index 4ff1ca0..192290c 100644
--- a/src/cmark.h
+++ b/src/cmark.h
@@ -525,13 +525,13 @@ char *cmark_render_commonmark(cmark_node *root, int options, int width);
* In hexadecimal format, the number 0x010203 represents version 1.2.3.
*/
CMARK_EXPORT
-extern const int cmark_version;
+int cmark_version();
/** The library version string for runtime checks. Also available as
* macro CMARK_VERSION_STRING for compile time checks.
*/
CMARK_EXPORT
-extern const char cmark_version_string[];
+const char *cmark_version_string();
/** # AUTHORS
*