summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKirill Simonov <xi@resolvent.net>2006-07-03 13:49:14 +0000
committerKirill Simonov <xi@resolvent.net>2006-07-03 13:49:14 +0000
commit5eff53a4ac5d9d9563d5e6fdc073914d6ea88b49 (patch)
tree987c20174f5dbe6b13df1484796280058dc8a8e7 /include
parent26687d7db8333d9f3562cc701f0bfcc47369eb88 (diff)
downloadlibyaml-git-5eff53a4ac5d9d9563d5e6fdc073914d6ea88b49.tar.gz
Move yaml/yaml.h to yaml.h and merge version.c to api.c.
Diffstat (limited to 'include')
-rw-r--r--include/Makefile.am2
-rw-r--r--include/yaml.h (renamed from include/yaml/yaml.h)0
-rw-r--r--include/yaml/yaml_error.h25
-rw-r--r--include/yaml/yaml_version.h33
4 files changed, 1 insertions, 59 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index 5c5f7dd..3c7323c 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = yaml/yaml.h #yaml/yaml_version.h yaml/yaml_error.h
+INCLUDES = yaml.h
DOXYGEN_CFG = $(top_srcdir)/doc/doxygen.cfg
nobase_include_HEADERS = $(INCLUDES)
diff --git a/include/yaml/yaml.h b/include/yaml.h
index 7ca4a9b..7ca4a9b 100644
--- a/include/yaml/yaml.h
+++ b/include/yaml.h
diff --git a/include/yaml/yaml_error.h b/include/yaml/yaml_error.h
deleted file mode 100644
index df0ca7d..0000000
--- a/include/yaml/yaml_error.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef YAML_ERROR_H
-#define YAML_ERROR_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef enum {
- YAML_NO_ERROR,
-
- YAML_MEMORY_ERROR,
-
- YAML_READER_ERROR,
- YAML_SCANNER_ERROR,
- YAML_PARSER_ERROR,
-
- YAML_WRITER_ERROR,
- YAML_EMITTER_ERROR
-} yaml_error_type_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* #ifndef YAML_ERROR_H */
diff --git a/include/yaml/yaml_version.h b/include/yaml/yaml_version.h
deleted file mode 100644
index 9718db2..0000000
--- a/include/yaml/yaml_version.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * @file yaml_version.h
- * @brief Version information.
- *
- * Do not include yaml_version.h directly.
- */
-
-#ifndef YAML_VERSION_H
-#define YAML_VERSION_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * @brief Get the library version.
- */
-
-const char *
-yaml_get_version_string(void);
-
-/*
- * @brief Get the library version numbers.
- */
-
-void
-yaml_get_version(int *major, int *minor, int *patch);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* #ifndef YAML_VERSION_H */