diff options
| author | Kirill Simonov <xi@resolvent.net> | 2006-07-03 13:49:14 +0000 |
|---|---|---|
| committer | Kirill Simonov <xi@resolvent.net> | 2006-07-03 13:49:14 +0000 |
| commit | 5eff53a4ac5d9d9563d5e6fdc073914d6ea88b49 (patch) | |
| tree | 987c20174f5dbe6b13df1484796280058dc8a8e7 /src | |
| parent | 26687d7db8333d9f3562cc701f0bfcc47369eb88 (diff) | |
| download | libyaml-git-5eff53a4ac5d9d9563d5e6fdc073914d6ea88b49.tar.gz | |
Move yaml/yaml.h to yaml.h and merge version.c to api.c.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/api.c | 16 | ||||
| -rw-r--r-- | src/reader.c | 2 | ||||
| -rw-r--r-- | src/scanner.c | 2 | ||||
| -rw-r--r-- | src/version.c | 21 |
5 files changed, 18 insertions, 25 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index d30f3dd..c8797dc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ AM_CPPFLAGS = -I$(top_srcdir)/include lib_LTLIBRARIES = libyaml.la -libyaml_la_SOURCES = version.c api.c reader.c scanner.c +libyaml_la_SOURCES = api.c reader.c scanner.c libyaml_la_LDFLAGS = -release $(YAML_LT_RELEASE) -version-info $(YAML_LT_CURRENT):$(YAML_LT_REVISION):$(YAML_LT_AGE) @@ -3,10 +3,24 @@ #include <config.h> #endif -#include <yaml/yaml.h> +#include <yaml.h> #include <assert.h> +YAML_DECLARE(const char *) +yaml_get_version_string(void) +{ + return YAML_VERSION_STRING; +} + +YAML_DECLARE(void) +yaml_get_version(int *major, int *minor, int *patch) +{ + *major = YAML_VERSION_MAJOR; + *minor = YAML_VERSION_MINOR; + *patch = YAML_VERSION_PATCH; +} + /* * Allocate a dynamic memory block. */ diff --git a/src/reader.c b/src/reader.c index 946d298..9cc8e7b 100644 --- a/src/reader.c +++ b/src/reader.c @@ -3,7 +3,7 @@ #include <config.h> #endif -#include <yaml/yaml.h> +#include <yaml.h> #include <assert.h> diff --git a/src/scanner.c b/src/scanner.c index 8313acd..45af0c1 100644 --- a/src/scanner.c +++ b/src/scanner.c @@ -479,7 +479,7 @@ #include <config.h> #endif -#include <yaml/yaml.h> +#include <yaml.h> #include <assert.h> diff --git a/src/version.c b/src/version.c deleted file mode 100644 index b7f5904..0000000 --- a/src/version.c +++ /dev/null @@ -1,21 +0,0 @@ - -#if HAVE_CONFIG_H -#include <config.h> -#endif - -#include <yaml/yaml.h> - -const char * -yaml_get_version_string(void) -{ - return YAML_VERSION_STRING; -} - -void -yaml_get_version(int *major, int *minor, int *patch) -{ - *major = YAML_VERSION_MAJOR; - *minor = YAML_VERSION_MINOR; - *patch = YAML_VERSION_PATCH; -} - |