aboutsummaryrefslogtreecommitdiff
path: root/libpkgconf/libpkgconf.h
diff options
context:
space:
mode:
Diffstat (limited to 'libpkgconf/libpkgconf.h')
-rw-r--r--libpkgconf/libpkgconf.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/libpkgconf/libpkgconf.h b/libpkgconf/libpkgconf.h
index 096d92b..d7fe911 100644
--- a/libpkgconf/libpkgconf.h
+++ b/libpkgconf/libpkgconf.h
@@ -16,19 +16,18 @@
#ifndef LIBPKGCONF__LIBPKGCONF_H
#define LIBPKGCONF__LIBPKGCONF_H
-/*
- * Wrap the header content into the 'extern "C"' block, so C++ compiler can
- * handle it properly (issue #136 is reported).
- */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <libpkgconf/stdinc.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdbool.h>
#include <libpkgconf/iter.h>
#include <libpkgconf/bsdstubs.h>
#include <libpkgconf/libpkgconf-api.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* pkg-config uses ';' on win32 as ':' is part of path */
#ifdef _WIN32
#define PKG_CONFIG_PATH_SEP_S ";"
@@ -169,6 +168,8 @@ struct pkgconf_client_ {
unsigned int flags;
char *prefix_varname;
+
+ bool already_sent_notice;
};
/* client.c */
@@ -264,7 +265,6 @@ PKGCONF_API void pkgconf_dependency_parse_str(const pkgconf_client_t *client, pk
PKGCONF_API void pkgconf_dependency_parse(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, pkgconf_list_t *deplist_head, const char *depends);
PKGCONF_API void pkgconf_dependency_append(pkgconf_list_t *list, pkgconf_dependency_t *tail);
PKGCONF_API void pkgconf_dependency_free(pkgconf_list_t *list);
-PKGCONF_API const char *pkgconf_dependency_to_str(const pkgconf_dependency_t *dep);
PKGCONF_API pkgconf_dependency_t *pkgconf_dependency_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *package, const char *version, pkgconf_pkg_comparator_t compare);
/* argvsplit.c */
@@ -325,7 +325,7 @@ PKGCONF_API void pkgconf_path_free(pkgconf_list_t *dirlist);
PKGCONF_API bool pkgconf_path_relocate(char *buf, size_t buflen);
#ifdef __cplusplus
-} /* end of the 'extern "C"' block */
+}
#endif
#endif