Drop PAKFIRE_PRIVATE

Everything is now private so we won't need this guard any more.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index a0a6d5d5a7b952ca3bb8eb3cddb04653b41f31e5..d027a020e949f0b9e6f89d8a2a36142faf41ef60 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,7 +54,9 @@ AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        $(OUR_CPPFLAGS)
 
-AM_CFLAGS = $(OUR_CFLAGS) \
+AM_CFLAGS = \
+       $(OUR_CFLAGS) \
+       $(JSON_C_CFLAGS) \
        -ffunction-sections \
        -fdata-sections
 
@@ -166,14 +168,12 @@ libpakfire_parser_la_SOURCES = \
 
 libpakfire_parser_la_CFLAGS = \
        $(AM_CFLAGS) \
-       $(COVERAGE_CFLAGS) \
-       $(JSON_C_CFLAGS)
+       $(COVERAGE_CFLAGS)
 
 libpakfire_parser_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        -I$(top_srcdir)/src \
-       -include $(top_builddir)/config.h \
-       -DPAKFIRE_PRIVATE
+       -include $(top_builddir)/config.h
 
 BUILT_SOURCES += \
        src/pakfire/parser/grammar.h
@@ -296,7 +296,6 @@ libpakfire_la_SOURCES = \
 libpakfire_la_CFLAGS = \
        $(AM_CFLAGS) \
        $(COVERAGE_CFLAGS) \
-       -fvisibility=hidden \
        $(BPF_CFLAGS) \
        $(CAP_CFLAGS) \
        $(CURL_CFLAGS) \
@@ -319,8 +318,7 @@ libpakfire_la_CFLAGS = \
 libpakfire_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        -I$(top_srcdir)/src \
-       -include $(top_builddir)/config.h \
-       -DPAKFIRE_PRIVATE
+       -include $(top_builddir)/config.h
 
 libpakfire_la_LDFLAGS = \
        $(AM_LDFLAGS) \
@@ -542,13 +540,11 @@ libcli_la_SOURCES = \
 
 libcli_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
-       -DPAKFIRE_PRIVATE \
        -I$(top_srcdir)/src
 
 libcli_la_CFLAGS = \
        $(AM_CFLAGS) \
-       $(COVERAGE_CFLAGS) \
-       $(JSON_C_CFLAGS)
+       $(COVERAGE_CFLAGS)
 
 libcli_la_LDFLAGS = \
        $(AM_LDFLAGS) \
@@ -1004,8 +1000,7 @@ dist_tests_parser_test_SOURCES = \
 
 tests_parser_test_CPPFLAGS = \
        $(AM_CPPFLAGS) \
-       -I$(top_srcdir)/src \
-       -DPAKFIRE_PRIVATE
+       -I$(top_srcdir)/src
 
 tests_parser_test_CFLAGS = \
        $(TESTSUITE_CFLAGS)
@@ -1172,13 +1167,11 @@ TESTSUITE_CPPFLAGS = \
        -DTEST_CONFIG_FILE=\"$(abs_top_srcdir)/contrib/config/pakfire.conf\" \
        -DTEST_DATA_DIR=\"$(abs_top_srcdir)/tests/data\" \
        -DTEST_ROOTFS=\"$(TEST_ROOTFS)\" \
-       -DTEST_STUB_ROOT=\"$(TEST_STUB_ROOT)\" \
-       -DPAKFIRE_PRIVATE
+       -DTEST_STUB_ROOT=\"$(TEST_STUB_ROOT)\"
 
 TESTSUITE_CFLAGS = \
        $(AM_CFLAGS) \
-       $(COVERAGE_CFLAGS) \
-       $(JSON_C_CFLAGS)
+       $(COVERAGE_CFLAGS)
 
 TESTSUITE_LDFLAGS = \
        $(AM_LDFLAGS) \

diff --git a/src/pakfire/arch.h b/src/pakfire/arch.h
index ac7649cc07f0cbc18dcd5db9ec9b87c5186c8ea7..e02a0475fbcdd393f4bcda3e4d1621d1b49c897c 100644 (file)
--- a/src/pakfire/arch.h
+++ b/src/pakfire/arch.h
@@ -27,8 +27,6 @@ const char* pakfire_arch_native(void);
 
 const char* pakfire_arch_is_supported_by_host(const char* name);
 
-#ifdef PAKFIRE_PRIVATE
-
 unsigned long pakfire_arch_personality(const char* name);
 
 #define pakfire_arch_machine(buffer, arch, vendor) \
@@ -44,6 +42,4 @@ int pakfire_arch_is_compatible(const char* name, const char* compatible_arch);
 
 char* pakfire_arch_find_interpreter(const char* name);
 
-#endif
-
 #endif /* PAKFIRE_ARCH_H */

diff --git a/src/pakfire/archive.h b/src/pakfire/archive.h
index f9465b62b85db5e0dc8844908ca4a76972955546..a795f1d9e04571a30ba34c902bbfa3b22edefa24 100644 (file)
--- a/src/pakfire/archive.h
+++ b/src/pakfire/archive.h
@@ -23,12 +23,15 @@
 
 #include <stddef.h>
 
+#include <archive_entry.h>
+
 struct pakfire_archive;
 
 #include <pakfire/digest.h>
 #include <pakfire/filelist.h>
 #include <pakfire/linter.h>
 #include <pakfire/package.h>
+#include <pakfire/pakfire.h>
 #include <pakfire/repo.h>
 #include <pakfire/scriptlet.h>
 
@@ -59,12 +62,6 @@ int pakfire_archive_make_package(struct pakfire_archive* archive,
 int pakfire_archive_lint(struct pakfire_archive* archive,
        pakfire_linter_result_callback callback, void* data);
 
-#ifdef PAKFIRE_PRIVATE
-
-#include <archive_entry.h>
-
-#include <pakfire/pakfire.h>
-
 // Walk
 
 typedef int (*pakfire_archive_walk_callback)(struct pakfire_archive* archive,
@@ -103,6 +100,4 @@ struct pakfire_scriptlet* pakfire_archive_get_scriptlet(
 
 int pakfire_archive_apply_systemd_sysusers(struct pakfire_archive* archive);
 
-#endif
-
 #endif /* PAKFIRE_ARCHIVE_H */

diff --git a/src/pakfire/base64.h b/src/pakfire/base64.h
index 91b236e44bd1e26d4747ab5296e8b1334434a972..bd56ce2a432923332455206e644c5dd41f372512 100644 (file)
--- a/src/pakfire/base64.h
+++ b/src/pakfire/base64.h
@@ -21,8 +21,6 @@
 #ifndef PAKFIRE_BASE64_H
 #define PAKFIRE_BASE64_H
 
-#ifdef PAKFIRE_PRIVATE
-
 #include <pakfire/ctx.h>
 
 int pakfire_b64encode(
@@ -31,5 +29,4 @@ int pakfire_b64encode(
 int pakfire_b64decode(
        struct pakfire_ctx* ctx, void** output, size_t* length, const char* buffer);
 
-#endif /* PAKFIRE_PRIVATE */
 #endif /* PAKFIRE_BASE64_H */

diff --git a/src/pakfire/cgroup.h b/src/pakfire/cgroup.h
index 493acae0a2ec6c227441a5619f42e354a41d71a1..3d7f067a714d43fc4c1be6525a3185796d141c49 100644 (file)
--- a/src/pakfire/cgroup.h
+++ b/src/pakfire/cgroup.h
@@ -21,8 +21,6 @@
 #ifndef PAKFIRE_CGROUP_H
 #define PAKFIRE_CGROUP_H
 
-#ifdef PAKFIRE_PRIVATE
-
 #include <pakfire/ctx.h>
 
 enum pakfire_cgroup_controllers {
@@ -238,6 +236,4 @@ int pakfire_cgroup_stat(struct pakfire_cgroup* cgroup,
 int pakfire_cgroup_stat_dump(struct pakfire_cgroup* cgroup,
        const struct pakfire_cgroup_stats* stats);
 
-#endif /* PAKFIRE_PRIVATE */
-
 #endif /* PAKFIRE_CGROUP_H */

diff --git a/src/pakfire/compress.h b/src/pakfire/compress.h
index f4f8005b7501e4e8f871c8ac11ccae415e51bdf2..88394e214185858112c0c58ce1720be58d4ce84e 100644 (file)
--- a/src/pakfire/compress.h
+++ b/src/pakfire/compress.h
@@ -21,8 +21,6 @@
 #ifndef PAKFIRE_COMPRESS_H
 #define PAKFIRE_COMPRESS_H
 
-#ifdef PAKFIRE_PRIVATE
-
 #include <archive.h>
 
 #include <pakfire/archive.h>
@@ -67,6 +65,4 @@ int pakfire_compress(struct pakfire* pakfire, struct archive* archive,
 int pakfire_compress_create_archive(struct pakfire* pakfire, struct archive** archive,
        FILE* f, const enum pakfire_compressions compression, const unsigned int level);
 
-#endif
-
 #endif /* PAKFIRE_COMPRESS_H */

diff --git a/src/pakfire/constants.h b/src/pakfire/constants.h
index 8005e210748bc3bed6285fee8b0514147880a234..45a866351cce45cdbb3bd975654170fc89196492 100644 (file)
--- a/src/pakfire/constants.h
+++ b/src/pakfire/constants.h
@@ -27,11 +27,7 @@
 // Maximum length of an architecture name
 #define ARCH_MAX                       16
 
-#ifdef PAKFIRE_PRIVATE
-
 // The file format that this version generates
 #define PACKAGE_FORMAT 6
 
-#endif /* PAKFIRE_PRIVATE */
-
 #endif /* PAKFIRE_CONSTANTS_H */

diff --git a/src/pakfire/ctx.h b/src/pakfire/ctx.h
index 696985e3686efa004b5951d924223af1df061df1..1e8068c233eda31037d45946df659b79841c44dd 100644 (file)
--- a/src/pakfire/ctx.h
+++ b/src/pakfire/ctx.h
@@ -25,6 +25,7 @@ struct pakfire_ctx;
 
 #include <pakfire/config.h>
 #include <pakfire/logging.h>
+#include <pakfire/os.h>
 #include <pakfire/pakfire.h>
 #include <pakfire/progress.h>
 #include <pakfire/transaction.h>
@@ -38,10 +39,7 @@ struct pakfire_ctx* pakfire_ctx_unref(struct pakfire_ctx* ctx);
 
 enum pakfire_ctx_flags {
        PAKFIRE_CTX_OFFLINE = (1 << 0),
-
-#ifdef PAKFIRE_PRIVATE
        PAKFIRE_CTX_IN_JAIL = (1 << 1),
-#endif /* PAKFIRE_PRIVATE */
 };
 
 int pakfire_ctx_has_flag(struct pakfire_ctx* ctx, int flag);
@@ -88,10 +86,6 @@ typedef int (*pakfire_pick_solution_callback)(struct pakfire_ctx* ctx,
 void pakfire_ctx_set_pick_solution_callback(struct pakfire_ctx* ctx,
        pakfire_pick_solution_callback callback, void* data);
 
-#ifdef PAKFIRE_PRIVATE
-
-#include <pakfire/os.h>
-
 // Distro
 const struct pakfire_distro* pakfire_ctx_get_distro(struct pakfire_ctx* ctx);
 
@@ -126,5 +120,4 @@ CURLSH* pakfire_ctx_curl_share(struct pakfire_ctx* ctx);
 
 magic_t pakfire_ctx_magic(struct pakfire_ctx* ctx);
 
-#endif /* PAKFIRE_PRIVATE */
 #endif /* PAKFIRE_CTX_H */

diff --git a/src/pakfire/daemon.h b/src/pakfire/daemon.h
index d1dab407b880b5d4e688b268d20ccfe52225b43f..ccca574c67de5bf0227be8468c207e6b244f72f5 100644 (file)
--- a/src/pakfire/daemon.h
+++ b/src/pakfire/daemon.h
@@ -21,7 +21,6 @@
 #ifndef PAKFIRE_DAEMON_H
 #define PAKFIRE_DAEMON_H
 
-#ifdef PAKFIRE_PRIVATE
 #ifdef CURL_HAS_WEBSOCKETS
 
 struct pakfire_daemon;
@@ -44,5 +43,4 @@ int pakfire_daemon_main(struct pakfire_daemon* daemon);
 int pakfire_daemon_job_finished(struct pakfire_daemon* daemon, struct pakfire_job* job);
 
 #endif /* CURL_HAS_WEBSOCKETS */
-#endif /* PAKFIRE_PRIVATE */
 #endif /* PAKFIRE_DAEMON_H */

diff --git a/src/pakfire/db.h b/src/pakfire/db.h
index 72084c9d305c60f7dc99adab6d5f0a39fc84652e..36a68cc56e975a4b0c478d58c19f76f97390fc0e 100644 (file)
--- a/src/pakfire/db.h
+++ b/src/pakfire/db.h
@@ -21,8 +21,6 @@
 #ifndef PAKFIRE_DB_H
 #define PAKFIRE_DB_H
 
-#ifdef PAKFIRE_PRIVATE
-
 #include <sys/types.h>
 
 #include <pakfire/archive.h>
@@ -60,6 +58,4 @@ int pakfire_db_filelist(struct pakfire_db* db, struct pakfire_filelist** filelis
 int pakfire_db_package_filelist(struct pakfire_db* db, struct pakfire_filelist** filelist,
        struct pakfire_package* pkg);
 
-#endif
-
 #endif /* PAKFIRE_DB_H */

diff --git a/src/pakfire/deps.h b/src/pakfire/deps.h
index 3fb33f55ff60ce324ef882d0e874a708cf8890dd..f6802c78e5f771d08ee6a5addd5654081b05fa5b 100644 (file)
--- a/src/pakfire/deps.h
+++ b/src/pakfire/deps.h
@@ -21,10 +21,6 @@
 #ifndef PAKFIRE_DEPENDENCIES_H
 #define PAKFIRE_DEPENDENCIES_H
 
-int pakfire_static_version_compare(const char* evr1, const char* evr2);
-
-#ifdef PAKFIRE_PRIVATE
-
 #include <pakfire/ctx.h>
 #include <pakfire/package.h>
 
@@ -33,12 +29,12 @@ extern const struct pakfire_dep {
        const char* name;
 } pakfire_deps[];
 
+int pakfire_static_version_compare(const char* evr1, const char* evr2);
+
 const char* pakfire_dep2str(struct pakfire* pakfire, Id id);
 Id pakfire_str2dep(struct pakfire* pakfire, const char* s);
 
 int pakfire_str2deps(struct pakfire* pakfire, struct pakfire_package* pkg,
        const enum pakfire_package_key key, const char* deps);
 
-#endif /* PAKFIRE_PRIVATE */
-
 #endif /* PAKFIRE_DEPENDENCIES_H */

diff --git a/src/pakfire/digest.h b/src/pakfire/digest.h
index cbcde085e387e9113d23d7ab0d6c5f7b81eb669c..a4789ee998f8da1ec59bfbc27c79f12f67bb7935 100644 (file)
--- a/src/pakfire/digest.h
+++ b/src/pakfire/digest.h
@@ -21,6 +21,11 @@
 #ifndef PAKFIRE_DIGEST_H
 #define PAKFIRE_DIGEST_H
 
+#include <stdio.h>
+
+// OpenSSL
+#include <openssl/sha.h>
+
 // Pakfire knows these digests
 enum pakfire_digest_types {
        PAKFIRE_DIGEST_UNDEFINED  = 0,
@@ -34,17 +39,11 @@ enum pakfire_digest_types {
 
 #define PAKFIRE_DIGESTS_ALL  (~PAKFIRE_DIGEST_UNDEFINED)
 
+#include <pakfire/ctx.h>
+
 const char* pakfire_digest_name(const enum pakfire_digest_types type);
 int pakfire_digest_get_by_name(const char* name);
 
-#ifdef PAKFIRE_PRIVATE
-
-#include <stdio.h>
-
-#include <openssl/sha.h>
-
-#include <pakfire/ctx.h>
-
 // libsolv only supports storing one checksum which has to be of a supported type
 #define PAKFIRE_ARCHIVE_CHECKSUM PAKFIRE_DIGEST_SHA2_512
 
@@ -101,6 +100,4 @@ int pakfire_digests_compare(struct pakfire_ctx* ctx, const struct pakfire_digest
 int pakfire_digests_compare_one(struct pakfire_ctx* ctx, struct pakfire_digests* digests1,
        const enum pakfire_digest_types type, const unsigned char* digest, const size_t length);
 
-#endif
-
 #endif /* PAKFIRE_DIGEST_H */

diff --git a/src/pakfire/dist.h b/src/pakfire/dist.h
index cec64bcff445be1fb9780f5108d96c17b863c21d..587757ef89426b33805e4d8a85ba80f487d4d118 100644 (file)
--- a/src/pakfire/dist.h
+++ b/src/pakfire/dist.h
@@ -22,17 +22,12 @@
 #define PAKFIRE_DIST_H
 
 #include <pakfire/pakfire.h>
+#include <pakfire/parser.h>
 
 int pakfire_dist(struct pakfire* pakfire, const char* path, const char* target,
        char** result);
 
-#ifdef PAKFIRE_PRIVATE
-
-#include <pakfire/parser.h>
-
 int pakfire_read_makefile(struct pakfire_parser** parser, struct pakfire* pakfire,
        const char* path, struct pakfire_parser_error** error);
 
-#endif
-
 #endif /* PAKFIRE_DIST_H */

diff --git a/src/pakfire/elf.h b/src/pakfire/elf.h
index 170698f59a78579e60be7570ab70fe4b570e02a4..1d0c888414300434aee00403ededd9c453d6b4d1 100644 (file)
--- a/src/pakfire/elf.h
+++ b/src/pakfire/elf.h
@@ -21,9 +21,6 @@
 #ifndef PAKFIRE_ELF_H
 #define PAKFIRE_ELF_H
 
-// This is all private stuff
-#ifdef PAKFIRE_PRIVATE
-
 struct pakfire_elf;
 
 #include <pakfire/ctx.h>
@@ -75,6 +72,4 @@ typedef int (*pakfire_elf_foreach_source_file_callback)
 int pakfire_elf_foreach_source_file(struct pakfire_elf* self,
        pakfire_elf_foreach_source_file_callback callback, void* data);
 
-#endif /* PAKFIRE_PRIVATE */
-
 #endif /* PAKFIRE_ELF_H */

diff --git a/src/pakfire/env.h b/src/pakfire/env.h
index 5dc361f978431c2283335181d1725bc87c64bfe9..ff720fe99059c74ccfdd04786ddb1cc5e8f66b67 100644 (file)
--- a/src/pakfire/env.h
+++ b/src/pakfire/env.h
@@ -21,8 +21,6 @@
 #ifndef PAKFIRE_ENV_H
 #define PAKFIRE_ENV_H
 
-#ifdef PAKFIRE_PRIVATE
-
 struct pakfire_env;
 
 #include <pakfire/ctx.h>
@@ -42,5 +40,4 @@ int pakfire_env_import(struct pakfire_env* env, const char** e);
 
 int pakfire_env_merge(struct pakfire_env* env1, struct pakfire_env* env2);
 
-#endif /* PAKFIRE_PRIVATE */
 #endif /* PAKFIRE_ENV_H */

diff --git a/src/pakfire/file.h b/src/pakfire/file.h
index e77f3d00f23cd1f6fa43278650eea8cb3d9f6f1f..84ff7099a9a919e301f45eacf019544d9714d24b 100644 (file)
--- a/src/pakfire/file.h
+++ b/src/pakfire/file.h
@@ -21,10 +21,15 @@
 #ifndef PAKFIRE_FILE_H
 #define PAKFIRE_FILE_H
 
+#include <sys/capability.h>
 #include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
 
+// libarchive
+#include <archive.h>
+#include <archive_entry.h>
+
 struct pakfire_file;
 
 #include <pakfire/digest.h>
@@ -100,13 +105,6 @@ struct pakfire_file* pakfire_file_parse_from_file(const char* list, unsigned int
 
 int pakfire_file_matches(struct pakfire_file* file, const char* pattern);
 
-#ifdef PAKFIRE_PRIVATE
-
-#include <archive.h>
-#include <archive_entry.h>
-
-#include <sys/capability.h>
-
 enum pakfire_file_classes {
        PAKFIRE_FILE_UNKNOWN         = 0,
 
@@ -182,5 +180,4 @@ int pakfire_file_consume(struct pakfire_file* file, int srcfd);
 
 int pakfire_file_fix_interpreter(struct pakfire_file* file);
 
-#endif /* PAKFIRE_PRIVATE */
 #endif /* PAKFIRE_FILE_H */

diff --git a/src/pakfire/filelist.h b/src/pakfire/filelist.h
index 8d47a20e2f27e5c005ef53b9f7c51131fc83e97b..1377019880bd0957cdbb68d8407eb9cdaa9959c5 100644 (file)
--- a/src/pakfire/filelist.h
+++ b/src/pakfire/filelist.h
@@ -21,8 +21,11 @@
 #ifndef PAKFIRE_FILELIST_H
 #define PAKFIRE_FILELIST_H
 
+#include <stdio.h>
+
 struct pakfire_filelist;
 
+#include <pakfire/ctx.h>
 #include <pakfire/file.h>
 #include <pakfire/pakfire.h>
 
@@ -39,12 +42,6 @@ struct pakfire_file* pakfire_filelist_get(struct pakfire_filelist* list, size_t
 
 int pakfire_filelist_add(struct pakfire_filelist* list, struct pakfire_file* file);
 
-#ifdef PAKFIRE_PRIVATE
-
-#include <stdio.h>
-
-#include <pakfire/ctx.h>
-
 size_t pakfire_filelist_total_size(struct pakfire_filelist* list);
 
 int pakfire_filelist_remove_all(struct pakfire_filelist* list,
@@ -77,6 +74,4 @@ int pakfire_filelist_cleanup(struct pakfire_filelist* list, int flags);
 
 int pakfire_filelist_matches_class(struct pakfire_filelist* list, int class);
 
-#endif
-
 #endif /* PAKFIRE_FILELIST_H */

diff --git a/src/pakfire/hex.h b/src/pakfire/hex.h
index 4caa929c2daed462358af0b8c5001adb105fd83c..f79dc32a319b14e95b8a9cdc796bde376d5adc58 100644 (file)
--- a/src/pakfire/hex.h
+++ b/src/pakfire/hex.h
@@ -21,8 +21,6 @@
 #ifndef PAKFIRE_HEX_H
 #define PAKFIRE_HEX_H
 
-#ifdef PAKFIRE_PRIVATE
-
 #define pakfire_hexlify(digest) __pakfire_hexlify(digest, sizeof(digest))
 
 char* __pakfire_hexlify(const unsigned char* digest, const size_t length);
@@ -31,5 +29,4 @@ char* __pakfire_hexlify(const unsigned char* digest, const size_t length);
 
 int __pakfire_unhexlify(unsigned char* dst, const size_t l, const char* src);
 
-#endif /* PAKFIRE_PRIVATE */
 #endif /* PAKFIRE_HEX_H */

diff --git a/src/pakfire/httpclient.h b/src/pakfire/httpclient.h
index 9c3836c3949633724ea75f21e0570a2e240a0f11..334ddda666012c1dbcb07bb6de659947c0a7c76a 100644 (file)
--- a/src/pakfire/httpclient.h
+++ b/src/pakfire/httpclient.h
@@ -21,8 +21,7 @@
 #ifndef PAKFIRE_HTTPCLIENT_H
 #define PAKFIRE_HTTPCLIENT_H
 
-#ifdef PAKFIRE_PRIVATE
-
+// systemd
 #include <systemd/sd-event.h>
 
 struct pakfire_httpclient;
@@ -45,5 +44,4 @@ int pakfire_httpclient_remove_xfer(
 
 int pakfire_httpclient_run(struct pakfire_httpclient* client, const char* title);
 
-#endif /* PAKFIRE_PRIVATE */
 #endif /* PAKFIRE_HTTPCLIENT_H */

diff --git a/src/pakfire/jail.h b/src/pakfire/jail.h
index e217eeb2c84a5a51c9396a4854fc802535ab9a64..63c6ec2005389fee9ec10c288a244a04d395e184 100644 (file)
--- a/src/pakfire/jail.h
+++ b/src/pakfire/jail.h
@@ -21,8 +21,6 @@
 #ifndef PAKFIRE_JAIL_H
 #define PAKFIRE_JAIL_H
 
-#ifdef PAKFIRE_PRIVATE
-
 #include <pakfire/cgroup.h>
 #include <pakfire/env.h>
 #include <pakfire/pakfire.h>
@@ -98,5 +96,4 @@ int pakfire_jail_shell(struct pakfire_jail* jail, struct pakfire_env* env);
 int pakfire_jail_ldconfig(struct pakfire* pakfire);
 int pakfire_jail_run_systemd_tmpfiles(struct pakfire* pakfire);
 
-#endif /* PAKFIRE_PRIVATE */
 #endif /* PAKFIRE_JAIL_H */

diff --git a/src/pakfire/job.h b/src/pakfire/job.h
index e131c7db9b94896cb20c097b8f47f9b207766bec..e83cb2d85bf2af977e992b8f5c6e9bfb4db7da91 100644 (file)
--- a/src/pakfire/job.h
+++ b/src/pakfire/job.h
@@ -21,7 +21,6 @@
 #ifndef PAKFIRE_JOB_H
 #define PAKFIRE_JOB_H
 
-#ifdef PAKFIRE_PRIVATE
 #ifdef CURL_HAS_WEBSOCKETS
 
 #include <pakfire/ctx.h>
@@ -41,5 +40,4 @@ int pakfire_job_terminate(struct pakfire_job* worker, int signal);
 int pakfire_job_exited(sd_event_source* s, const siginfo_t* si, void* data);
 
 #endif /* CURL_HAS_WEBSOCKETS */
-#endif /* PAKFIRE_PRIVATE */
 #endif /* PAKFIRE_JOB_H */

diff --git a/src/pakfire/key.h b/src/pakfire/key.h
index 15a0056a2cd3caede08364165818c11b41e47a62..c7eedeb3504d7ea48fb91e65362874284405689b 100644 (file)
--- a/src/pakfire/key.h
+++ b/src/pakfire/key.h
@@ -60,13 +60,9 @@ int pakfire_key_sign(struct pakfire_key* key,
 int pakfire_key_verify(struct pakfire_key* key,
        FILE* f, const void* data, const size_t length);
 
-#ifdef PAKFIRE_PRIVATE
-
 int pakfire_key_import_from_string(struct pakfire_key** key,
        struct pakfire_ctx* ctx, const char* data, const size_t length);
 
 int pakfire_key_signf(struct pakfire_key* key, FILE* s, FILE* f, const char* comment);
 
-#endif
-
 #endif /* PAKFIRE_KEY_H */

diff --git a/src/pakfire/linter-file.h b/src/pakfire/linter-file.h
index 976f2356a403444cb6f5acef1778fea9f355ce9d..88845f608728444aa1484ef3a74cb739cd716174 100644 (file)
--- a/src/pakfire/linter-file.h
+++ b/src/pakfire/linter-file.h
@@ -21,8 +21,6 @@
 #ifndef PAKFIRE_LINTER_FILE_H
 #define PAKFIRE_LINTER_FILE_H
 
-#ifdef PAKFIRE_PRIVATE
-
 struct pakfire_linter_file;
 
 #include <pakfire/ctx.h>
@@ -37,5 +35,4 @@ struct pakfire_linter_file* pakfire_linter_file_unref(struct pakfire_linter_file
 
 int pakfire_linter_file_lint(struct pakfire_linter_file* lfile);
 
-#endif /* PAKFIRE_PRIVATE */
 #endif /* PAKFIRE_LINTER_FILE_H */

diff --git a/src/pakfire/linter.h b/src/pakfire/linter.h
index 010d2fc3d55abc1dcf37b0f1fe68c4c6bac27b0b..586f9283cb98a1b3f8ede4269485525a0c8cbcae 100644 (file)
--- a/src/pakfire/linter.h
+++ b/src/pakfire/linter.h
@@ -36,8 +36,6 @@ typedef int (*pakfire_linter_result_callback)(struct pakfire_ctx* ctx,
        struct pakfire_archive* archive, struct pakfire_package* package,
        struct pakfire_file* file, int priority, const char* message, void* data);
 
-#ifdef PAKFIRE_PRIVATE
-
 struct pakfire_linter;
 
 int pakfire_linter_create(struct pakfire_linter** linter,
@@ -61,5 +59,4 @@ int pakfire_linter_result(struct pakfire_linter* linter, struct pakfire_file* fi
 #define pakfire_linter_error(linter, format, ...) \
        pakfire_linter_result(linter, NULL, PAKFIRE_LINTER_ERROR, format, ## __VA_ARGS__)
 
-#endif /* PAKFIRE_PRIVATE */
 #endif /* PAKFIRE_LINTER_H */

diff --git a/src/pakfire/log_buffer.h b/src/pakfire/log_buffer.h
index 1480f7bee2def3d47be0ff72f5bf30b88b1268b6..3dc865eab842d4b98845fc782b560ed4a2abfcf0 100644 (file)
--- a/src/pakfire/log_buffer.h
+++ b/src/pakfire/log_buffer.h
@@ -21,8 +21,6 @@
 #ifndef PAKFIRE_LOG_BUFFER_H
 #define PAKFIRE_LOG_BUFFER_H
 
-#ifdef PAKFIRE_PRIVATE
-
 #include <pakfire/ctx.h>
 
 /*
@@ -38,5 +36,4 @@ struct pakfire_log_buffer* pakfire_log_buffer_unref(struct pakfire_log_buffer* b
 int pakfire_log_buffer_enqueue(struct pakfire_log_buffer* buffer, int priority, const char* line, ssize_t length);
 int pakfire_log_buffer_dequeue(struct pakfire_log_buffer* buffer, int* priority, char** line, size_t* length);
 
-#endif /* PAKFIRE_PRIVATE */
 #endif /* PAKFIRE_LOG_BUFFER_H */

diff --git a/src/pakfire/log_stream.h b/src/pakfire/log_stream.h
index ca98ba95c6e3d69c6f886d18c43c8f72a4d039d4..7d740a21f3363fad7ab3d74f00bddc2c49fd6031 100644 (file)
--- a/src/pakfire/log_stream.h
+++ b/src/pakfire/log_stream.h
@@ -21,8 +21,6 @@
 #ifndef PAKFIRE_LOG_STREAM_H
 #define PAKFIRE_LOG_STREAM_H
 
-#ifdef PAKFIRE_PRIVATE
-
 #include <stdarg.h>
 
 #include <systemd/sd-event.h>
@@ -45,5 +43,4 @@ int pakfire_log_stream_in_child(struct pakfire_log_stream* stream);
 int pakfire_log_stream_write(struct pakfire_log_stream* stream,
        const char* format, va_list args) __attribute__((format(printf, 2, 0)));
 
-#endif /* PAKFIRE_PRIVATE */
 #endif /* PAKFIRE_LOG_STREAM_H */

diff --git a/src/pakfire/logging.h b/src/pakfire/logging.h
index 8ff9f80538a1c1c823684c13754c2defb08cdc22..862005b298748481da594b0151cd0112fa472d2d 100644 (file)
--- a/src/pakfire/logging.h
+++ b/src/pakfire/logging.h
@@ -22,10 +22,14 @@
 #define PAKFIRE_LOGGING_H
 
 #include <stdarg.h>
+#include <syslog.h>
 
 typedef void (*pakfire_log_callback)(void* data, int priority, const char* file,
        int line, const char* fn, const char* format, va_list args);
 
+#include <pakfire/ctx.h>
+#include <pakfire/pakfire.h>
+
 void pakfire_log_stderr(void* data, int priority, const char* file,
        int line, const char* fn, const char* format, va_list args)
        __attribute__((format(printf, 6, 0)));
@@ -33,13 +37,6 @@ void pakfire_log_syslog(void* data, int priority, const char* file,
        int line, const char* fn, const char* format, va_list args)
        __attribute__((format(printf, 6, 0)));
 
-#ifdef PAKFIRE_PRIVATE
-
-#include <syslog.h>
-
-#include <pakfire/ctx.h>
-#include <pakfire/pakfire.h>
-
 #define pakfire_ctx_log_condition(ctx, level, arg...) \
        do { \
                if (pakfire_ctx_get_log_level(ctx) >= level) \
@@ -60,5 +57,4 @@ static inline void __attribute__((always_inline, format(printf, 2, 3)))
 #      define DEBUG pakfire_ctx_log_null
 #endif
 
-#endif /* PAKFIRE_PRIVATE */
 #endif /* PAKFIRE_LOGGING_H */

diff --git a/src/pakfire/mirrorlist.h b/src/pakfire/mirrorlist.h
index 9330b2300d89ef9a03ded340963bb5ade8e6a3c1..a378228282b2c938821854fb76d9d06d11ebc6d4 100644 (file)
--- a/src/pakfire/mirrorlist.h
+++ b/src/pakfire/mirrorlist.h
@@ -21,8 +21,6 @@
 #ifndef PAKFIRE_MIRRORLIST_H
 #define PAKFIRE_MIRRORLIST_H
 
-#ifdef PAKFIRE_PRIVATE
-
 struct pakfire_mirrorlist;
 
 #include <pakfire/ctx.h>
@@ -44,6 +42,4 @@ struct pakfire_mirror* pakfire_mirrorlist_get_first(struct pakfire_mirrorlist* l
 struct pakfire_mirror* pakfire_mirrorlist_get_next(
        struct pakfire_mirrorlist* list, struct pakfire_mirror* mirror);
 
-#endif /* PAKFIRE_PRIVATE */
-
 #endif /* PAKFIRE_MIRRORLIST_H */

diff --git a/src/pakfire/mount.h b/src/pakfire/mount.h
index f907113d4a0205e775da7cb4720abd1ed0d993e0..fc50eb9c9c049246855e12a1ee5bd7fd7b7bd49d 100644 (file)
--- a/src/pakfire/mount.h
+++ b/src/pakfire/mount.h
@@ -21,8 +21,6 @@
 #ifndef PAKFIRE_MOUNT_H
 #define PAKFIRE_MOUNT_H
 
-#ifdef PAKFIRE_PRIVATE
-
 #include <pakfire/ctx.h>
 #include <pakfire/pakfire.h>
 
@@ -51,6 +49,4 @@ enum pakfire_mount_flags {
 int pakfire_mount_all(struct pakfire_ctx* ctx, struct pakfire* pakfire,
        pakfire_mntns_t ns, int flags);
 
-#endif /* PAKFIRE_PRIVATE */
-
 #endif /* PAKFIRE_MOUNT_H */

diff --git a/src/pakfire/os.h b/src/pakfire/os.h
index 26a74103aed2c8eb06cd6fbbdde2564cb5999e73..522fb901759d7fd086eed1798b98c545cb9fe2d2 100644 (file)
--- a/src/pakfire/os.h
+++ b/src/pakfire/os.h
@@ -21,8 +21,6 @@
 #ifndef PAKFIRE_OS_H
 #define PAKFIRE_OS_H
 
-#ifdef PAKFIRE_PRIVATE
-
 #include <stdint.h>
 #include <unistd.h>
 
@@ -103,6 +101,4 @@ struct pakfire_distro {
 
 int pakfire_distro(struct pakfire_distro* distro, const char* path);
 
-#endif /* PAKFIRE_PRIVATE */
-
 #endif /* PAKFIRE_OS_H */

diff --git a/src/pakfire/package.h b/src/pakfire/package.h
index 87e52ee4a9b9e35cec49ea743ab254c744d42f9e..e6312296ba7a6c32aa5f903a6c110abe73bdfaf8 100644 (file)
--- a/src/pakfire/package.h
+++ b/src/pakfire/package.h
@@ -21,8 +21,13 @@
 #ifndef PAKFIRE_PACKAGE_H
 #define PAKFIRE_PACKAGE_H
 
+#include <stdint.h>
 #include <time.h>
 
+#include <json.h>
+
+#include <solv/pooltypes.h>
+
 #include <uuid/uuid.h>
 
 struct pakfire_package;
@@ -148,14 +153,6 @@ enum pakfire_package_dump_flags {
 // Installcheck
 int pakfire_package_installcheck(struct pakfire_package* pkg, char** problem, int flags);
 
-#ifdef PAKFIRE_PRIVATE
-
-#include <stdint.h>
-
-#include <json.h>
-
-#include <solv/pooltypes.h>
-
 int pakfire_package_create_from_solvable(struct pakfire_package** package,
        struct pakfire* pakfire, Id id);
 
@@ -186,6 +183,4 @@ int pakfire_package_matches_dep(struct pakfire_package* pkg,
 
 struct json_object* pakfire_package_to_json(struct pakfire_package* pkg);
 
-#endif
-
 #endif /* PAKFIRE_PACKAGE_H */

diff --git a/src/pakfire/packagelist.h b/src/pakfire/packagelist.h
index 8877b9b083779a3238c7912de14491d38d583ef4..328c3a74ff3310e5f8ca86e6016290cc262bdf34 100644 (file)
--- a/src/pakfire/packagelist.h
+++ b/src/pakfire/packagelist.h
@@ -21,10 +21,13 @@
 #ifndef PAKFIRE_PACKAGELIST_H
 #define PAKFIRE_PACKAGELIST_H
 
+#include <solv/queue.h>
+
 struct pakfire_packagelist;
 
 #include <pakfire/ctx.h>
 #include <pakfire/package.h>
+#include <pakfire/pakfire.h>
 
 int pakfire_packagelist_create(struct pakfire_packagelist** list, struct pakfire_ctx* ctx);
 struct pakfire_packagelist* pakfire_packagelist_ref(struct pakfire_packagelist* list);
@@ -45,15 +48,7 @@ enum pakfire_packagelist_walk_flags {
 int pakfire_packagelist_walk(struct pakfire_packagelist* list,
        pakfire_packagelist_walk_callback callback, void* p, int flags);
 
-#ifdef PAKFIRE_PRIVATE
-
-#include <solv/queue.h>
-
-#include <pakfire/pakfire.h>
-
 int pakfire_packagelist_import_solvables(struct pakfire_packagelist* list,
        struct pakfire* pakfire, Queue* q);
 
-#endif
-
 #endif /* PAKFIRE_PACKAGELIST_H */

diff --git a/src/pakfire/packager.h b/src/pakfire/packager.h
index 150a2c60cd599b1b20f862e5736bde99c3bf7174..7025da6ec333a637714fe98535155275a14de85c 100644 (file)
--- a/src/pakfire/packager.h
+++ b/src/pakfire/packager.h
@@ -21,8 +21,6 @@
 #ifndef PAKFIRE_PACKAGER_H
 #define PAKFIRE_PACKAGER_H
 
-#ifdef PAKFIRE_PRIVATE
-
 #include <pakfire/digest.h>
 #include <pakfire/file.h>
 #include <pakfire/filelist.h>
@@ -57,6 +55,4 @@ int pakfire_packager_add_scriptlet(struct pakfire_packager* packager,
 
 int pakfire_packager_cleanup(struct pakfire_packager* packager);
 
-#endif
-
 #endif /* PAKFIRE_PACKAGER_H */

diff --git a/src/pakfire/pakfire.h b/src/pakfire/pakfire.h
index bac39cb18e4ef44313a1d163d2c6973886063ce5..149a80739992c9687f849ebfa58cd4fe241ba430 100644 (file)
--- a/src/pakfire/pakfire.h
+++ b/src/pakfire/pakfire.h
@@ -25,8 +25,12 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <time.h>
 
+// libsolv
+#include <solv/pool.h>
+
 struct pakfire;
 
 #include <pakfire/config.h>
@@ -36,6 +40,7 @@ struct pakfire;
 #include <pakfire/packagelist.h>
 #include <pakfire/parser.h>
 #include <pakfire/progress.h>
+#include <pakfire/pwd.h>
 #include <pakfire/repo.h>
 #include <pakfire/repolist.h>
 #include <pakfire/transaction.h>
@@ -90,15 +95,6 @@ int pakfire_check(struct pakfire* pakfire, struct pakfire_filelist* errors);
 // Snapshots
 int pakfire_update_snapshot(struct pakfire* pakfire);
 
-#ifdef PAKFIRE_PRIVATE
-
-#include <sys/types.h>
-
-#include <solv/pool.h>
-
-#include <pakfire/config.h>
-#include <pakfire/pwd.h>
-
 int pakfire_clone(struct pakfire** clone, struct pakfire* pakfire, const char* path);
 
 struct pakfire_ctx* pakfire_ctx(struct pakfire* pakfire);
@@ -159,6 +155,4 @@ int pakfire_repo_walk(struct pakfire* pakfire,
 struct archive* pakfire_get_disk_reader(struct pakfire* pakfire);
 struct archive* pakfire_get_disk_writer(struct pakfire* pakfire);
 
-#endif
-
 #endif /* PAKFIRE_PAKFIRE_H */

diff --git a/src/pakfire/parse.h b/src/pakfire/parse.h
index abf6121ce73829fd9855f9b6e5fe102bf49e7c65..30f6f6802826ba0c404458600fbfa9483c3f53cb 100644 (file)
--- a/src/pakfire/parse.h
+++ b/src/pakfire/parse.h
@@ -21,8 +21,6 @@
 #ifndef PAKFIRE_PARSE_H
 #define PAKFIRE_PARSE_H
 
-#ifdef PAKFIRE_PRIVATE
-
 /*
        A callback that is called for each line that there is to parse.
 */
@@ -34,6 +32,4 @@ int pakfire_parse_file(const char* path, pakfire_parse_line parse, void* data);
 // Splits a line into two parts separated by the given delimiter
 int pakfire_parse_split_line(char* line, size_t length, char** key, char** value, char delim);
 
-#endif /* PAKFIRE_PRIVATE */
-
 #endif /* PAKFIRE_PARSE_H */

diff --git a/src/pakfire/parser.h b/src/pakfire/parser.h
index d8f56f16fe05602da2d502d607a71ccb217a4679..54a0fb18658da7e8f05f99c389c1488e19f07eda 100644 (file)
--- a/src/pakfire/parser.h
+++ b/src/pakfire/parser.h
@@ -21,8 +21,6 @@
 #ifndef PAKFIRE_PARSER_H
 #define PAKFIRE_PARSER_H
 
-#ifdef PAKFIRE_PRIVATE
-
 #include <linux/limits.h>
 #include <stdio.h>
 
@@ -116,6 +114,4 @@ int pakfire_parser_parse_data(struct pakfire_parser* parent, const char* data, s
 
 int pakfire_parser_set_env(struct pakfire_parser* parser, struct pakfire_env* env);
 
-#endif /* PAKFIRE_PRIVATE */
-
 #endif /* PAKFIRE_PARSER_H */

diff --git a/src/pakfire/problem.h b/src/pakfire/problem.h
index 780794bf40ab3d9c95a33a5331bd107f08daf1fa..3b75ad87191e4ee9754331d0b5332a36cc72ecc2 100644 (file)
--- a/src/pakfire/problem.h
+++ b/src/pakfire/problem.h
@@ -21,9 +21,13 @@
 #ifndef PAKFIRE_PROBLEM_H
 #define PAKFIRE_PROBLEM_H
 
+// libsolv
+#include <solv/pooltypes.h>
+
 struct pakfire_problem;
 
 #include <pakfire/solution.h>
+#include <pakfire/transaction.h>
 
 struct pakfire_problem* pakfire_problem_ref(struct pakfire_problem* problem);
 struct pakfire_problem* pakfire_problem_unref(struct pakfire_problem* problem);
@@ -33,12 +37,6 @@ const char* pakfire_problem_to_string(struct pakfire_problem* problem);
 struct pakfire_solution** pakfire_problem_get_solutions(
        struct pakfire_problem* problem);
 
-#ifdef PAKFIRE_PRIVATE
-
-#include <solv/pooltypes.h>
-
-#include <pakfire/transaction.h>
-
 int pakfire_problem_create(struct pakfire_problem** problem, struct pakfire* pakfire,
        struct pakfire_transaction* transaction, Id id);
 
@@ -46,6 +44,4 @@ struct pakfire_transaction* pakfire_problem_get_transaction(struct pakfire_probl
 
 Id pakfire_problem_get_id(struct pakfire_problem* problem);
 
-#endif
-
 #endif /* PAKFIRE_PROBLEM_H */

diff --git a/src/pakfire/progress.h b/src/pakfire/progress.h
index 76bf73cfd0d717dde6504224184cb2461832f463..42205ea14138487fa169a44784f8bb7bffdf8b28 100644 (file)
--- a/src/pakfire/progress.h
+++ b/src/pakfire/progress.h
@@ -71,10 +71,6 @@ time_t pakfire_progress_get_elapsed_time(struct pakfire_progress* p);
 time_t pakfire_progress_get_eta(struct pakfire_progress* p);
 double pakfire_progress_get_transfer_speed(struct pakfire_progress* p);
 
-#ifdef PAKFIRE_PRIVATE
-
-#include <pakfire/pakfire.h>
-
 int pakfire_progress_create(struct pakfire_progress** progress,
        struct pakfire_ctx* ctx, int flags, struct pakfire_progress* parent);
 
@@ -91,6 +87,4 @@ int pakfire_progress_set_title(struct pakfire_progress* p, const char* format, .
        __attribute__((format(printf, 2, 3)));
 void pakfire_progress_set_max_value(struct pakfire_progress* p, unsigned long int value);
 
-#endif
-
 #endif /* PAKFIRE_PROGRESS_H */

diff --git a/src/pakfire/pty.h b/src/pakfire/pty.h
index bf7a78b282d4dbd5de4f1b3efaf4744e82d79810..0a8856e89dd6d84def515e5d915e5bb669d66564 100644 (file)
--- a/src/pakfire/pty.h
+++ b/src/pakfire/pty.h
@@ -21,8 +21,7 @@
 #ifndef PAKFIRE_PTY_H
 #define PAKFIRE_PTY_H
 
-#ifdef PAKFIRE_PRIVATE
-
+// libsystemd
 #include <systemd/sd-event.h>
 
 #include <pakfire/ctx.h>
@@ -59,5 +58,4 @@ void pakfire_pty_set_stdin_callback(struct pakfire_pty* pty,
 void pakfire_pty_set_stdout_callback(struct pakfire_pty* pty,
        pakfire_pty_stdout_callback callback, void* data);
 
-#endif /* PAKFIRE_PRIVATE */
 #endif /* PAKFIRE_PTY_H */

diff --git a/src/pakfire/pwd.h b/src/pakfire/pwd.h
index 2c38e46e82d4c8dd18c7e17ce81a12037dabbdd4..2c76de2b59124e13405d4e9cda8889866535be82 100644 (file)
--- a/src/pakfire/pwd.h
+++ b/src/pakfire/pwd.h
@@ -21,8 +21,6 @@
 #ifndef PAKFIRE_PWD_H
 #define PAKFIRE_PWD_H
 
-#ifdef PAKFIRE_PRIVATE
-
 #include <grp.h>
 #include <pwd.h>
 
@@ -41,6 +39,4 @@ struct group* pakfire_getgrgid(struct pakfire* pakfire, gid_t gid);
 int pakfire_getsubuid(struct pakfire* pakfire, const char* owner, struct pakfire_subid* subid);
 int pakfire_getsubgid(struct pakfire* pakfire, const char* owner, struct pakfire_subid* subid);
 
-#endif
-
 #endif /* PAKFIRE_PWD_H */

diff --git a/src/pakfire/repo.h b/src/pakfire/repo.h
index 71b07753bb5694733a367694f7d8ee6279411287..7b6b11e2ee2c9715d59491173fa7bcadc7cea8a0 100644 (file)
--- a/src/pakfire/repo.h
+++ b/src/pakfire/repo.h
@@ -25,10 +25,18 @@
 #include <time.h>
 #include <unistd.h>
 
+#include <solv/repo.h>
+
 struct pakfire_repo;
 
+#include <pakfire/archive.h>
+#include <pakfire/config.h>
+#include <pakfire/httpclient.h>
 #include <pakfire/key.h>
+#include <pakfire/package.h>
+#include <pakfire/packagelist.h>
 #include <pakfire/pakfire.h>
+#include <pakfire/xfer.h>
 
 int pakfire_repo_create(struct pakfire_repo** repo, struct pakfire* pakfire, const char* name);
 
@@ -92,17 +100,6 @@ int pakfire_repo_refresh(struct pakfire_repo* repo, int force);
 int pakfire_repo_compose(struct pakfire* pakfire, const char* path,
        struct pakfire_key* key, const char** files);
 
-#ifdef PAKFIRE_PRIVATE
-
-#include <solv/repo.h>
-
-#include <pakfire/archive.h>
-#include <pakfire/config.h>
-#include <pakfire/httpclient.h>
-#include <pakfire/package.h>
-#include <pakfire/packagelist.h>
-#include <pakfire/xfer.h>
-
 #define PAKFIRE_REPO_COMMANDLINE               "@commandline"
 #define PAKFIRE_REPO_DUMMY                             "@dummy"
 #define PAKFIRE_REPO_LOCAL              "local"
@@ -141,6 +138,4 @@ struct pakfire_mirrorlist* pakfire_repo_get_mirrorlist(struct pakfire_repo* repo
 int pakfire_repo_to_packagelist(struct pakfire_repo* repo,
        struct pakfire_packagelist* list);
 
-#endif
-
 #endif /* PAKFIRE_REPO_H */

diff --git a/src/pakfire/scriptlet.h b/src/pakfire/scriptlet.h
index 6c098a92657790f14faa1fab38292936cc21b02d..94396b1f6f166d2dc91ccdc6f43de80c8226e488 100644 (file)
--- a/src/pakfire/scriptlet.h
+++ b/src/pakfire/scriptlet.h
@@ -21,10 +21,6 @@
 #ifndef PAKFIRE_SCRIPTLET_H
 #define PAKFIRE_SCRIPTLET_H
 
-// This is an internal data structure
-
-#ifdef PAKFIRE_PRIVATE
-
 #include <pakfire/ctx.h>
 #include <pakfire/pakfire.h>
 
@@ -42,6 +38,4 @@ const char* pakfire_scriptlet_get_data(struct pakfire_scriptlet* scriptlet, size
 
 int pakfire_scriptlet_execute(struct pakfire_scriptlet* scriptlet, struct pakfire* pakfire);
 
-#endif /* PAKFIRE_PRIVATE */
-
 #endif /* PAKFIRE_SCRIPTLET_H */

diff --git a/src/pakfire/snapshot.h b/src/pakfire/snapshot.h
index 2803226879be3f97753291eb48283f73c8002d45..4f5cb0d01b6227a4b49d445e3ff07195ec6c4acc 100644 (file)
--- a/src/pakfire/snapshot.h
+++ b/src/pakfire/snapshot.h
@@ -21,8 +21,6 @@
 #ifndef PAKFIRE_SNAPSHOT_H
 #define PAKFIRE_SNAPSHOT_H
 
-#ifdef PAKFIRE_PRIVATE
-
 #include <stdio.h>
 
 #include <pakfire/pakfire.h>
@@ -46,5 +44,4 @@ int pakfire_snapshot_make(struct pakfire_snapshot** snapshot, struct pakfire* pa
 
 int pakfire_snapshot_clean(struct pakfire* pakfire);
 
-#endif /* PAKFIRE_PRIVATE */
 #endif /* PAKFIRE_SNAPSHOT_H */

diff --git a/src/pakfire/solution.h b/src/pakfire/solution.h
index bc6a160dee6565f6f694896571c16a930f77da73..78c5b417a4b17642ff9ab03fa82291803f6b9ee8 100644 (file)
--- a/src/pakfire/solution.h
+++ b/src/pakfire/solution.h
@@ -21,6 +21,9 @@
 #ifndef PAKFIRE_SOLUTION_H
 #define PAKFIRE_SOLUTION_H
 
+// libsolv
+#include <solv/pooltypes.h>
+
 struct pakfire_solution;
 
 #include <pakfire/pakfire.h>
@@ -31,15 +34,9 @@ struct pakfire_solution* pakfire_solution_unref(struct pakfire_solution* solutio
 
 const char* pakfire_solution_to_string(struct pakfire_solution* solution);
 
-#ifdef PAKFIRE_PRIVATE
-
-#include <solv/pooltypes.h>
-
 int pakfire_solution_create(struct pakfire_solution** solution, struct pakfire* pakfire,
        struct pakfire_problem* problem, Id id);
 struct pakfire_problem* pakfire_solution_get_problem(struct pakfire_solution* solution);
 Id pakfire_solution_get_id(struct pakfire_solution* solution);
 
-#endif /* PAKFIRE_PRIVATE */
-
 #endif /* PAKFIRE_SOLUTION_H */

diff --git a/src/pakfire/stripper.h b/src/pakfire/stripper.h
index 9233b4759bfbb60a1ff75fea790aee5fc2a0624a..59a0f0050059df75c111d61e303185e062b94951 100644 (file)
--- a/src/pakfire/stripper.h
+++ b/src/pakfire/stripper.h
@@ -21,8 +21,6 @@
 #ifndef PAKFIRE_STRIPPER_H
 #define PAKFIRE_STRIPPER_H
 
-#ifdef PAKFIRE_PRIVATE
-
 #define BUILD_SRC_DIR "/build/source"
 #define DEBUG_SRC_DIR "/usr/src/debug"
 
@@ -39,5 +37,4 @@ struct pakfire_stripper* pakfire_stripper_unref(struct pakfire_stripper* strippe
 
 int pakfire_stripper_run(struct pakfire_stripper* stripper);
 
-#endif /* PAKFIRE_PRIVATE */
 #endif /* PAKFIRE_STRIPPER_H */

diff --git a/src/pakfire/syscalls.h b/src/pakfire/syscalls.h
index 4e5147b92cae33123f63d2e66c3c00edda30b50d..b66054a09155eff882916a234c9f9903e6429bae 100644 (file)
--- a/src/pakfire/syscalls.h
+++ b/src/pakfire/syscalls.h
@@ -21,8 +21,6 @@
 #ifndef PAKFIRE_SYSCALLS_H
 #define PAKFIRE_SYSCALLS_H
 
-#ifdef PAKFIRE_PRIVATE
-
 #include <syscall.h>
 
 static inline int clone3(struct clone_args* args, size_t size) {
@@ -33,5 +31,4 @@ static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t* info, unsigne
        return syscall(SYS_pidfd_send_signal, pidfd, sig, info, flags);
 }
 
-#endif /* PAKFIRE_PRIVATE */
 #endif /* PAKFIRE_SYSCALLS_H */

diff --git a/src/pakfire/transaction.h b/src/pakfire/transaction.h
index 37091ef33e4fc734171efe2b0d3d99952ec309b7..1d50894945846f7ace9594d866dfa021a7fc137b 100644 (file)
--- a/src/pakfire/transaction.h
+++ b/src/pakfire/transaction.h
@@ -21,8 +21,12 @@
 #ifndef PAKFIRE_TRANSACTION_H
 #define PAKFIRE_TRANSACTION_H
 
+// libsolv
+#include <solv/solver.h>
+
 struct pakfire_transaction;
 
+#include <pakfire/key.h>
 #include <pakfire/package.h>
 #include <pakfire/pakfire.h>
 #include <pakfire/problem.h>
@@ -79,12 +83,6 @@ int pakfire_transaction_run(struct pakfire_transaction* transaction);
 
 int pakfire_transaction_download(struct pakfire_transaction* transaction);
 
-#ifdef PAKFIRE_PRIVATE
-
-#include <solv/solver.h>
-
-#include <pakfire/key.h>
-
 // XXX needs removal
 enum pakfire_request_solve_flags {
        PAKFIRE_REQ_SOLVE_INTERACTIVE,
@@ -95,6 +93,4 @@ Solver* pakfire_transaction_get_solver(struct pakfire_transaction* transaction);
 int pakfire_transaction_compose_repo(struct pakfire_transaction* transaction,
        struct pakfire_key* key, const char* path);
 
-#endif
-
 #endif /* PAKFIRE_TRANSACTION_H */

diff --git a/src/pakfire/util.h b/src/pakfire/util.h
index dba9f347a3052543d6e7303d056bbc316be82354..b2cdf80f1bfd39d44eddd7444fd7fadb25ce0a07 100644 (file)
--- a/src/pakfire/util.h
+++ b/src/pakfire/util.h
@@ -21,8 +21,6 @@
 #ifndef PAKFIRE_UTIL_H
 #define PAKFIRE_UTIL_H
 
-#ifdef PAKFIRE_PRIVATE
-
 #include <stdio.h>
 
 #define PCRE2_CODE_UNIT_WIDTH 8
@@ -112,6 +110,4 @@ static inline double pakfire_timespec_delta(struct timespec* t1, struct timespec
        ) / 1000.0;
 }
 
-#endif
-
 #endif /* PAKFIRE_UTIL_H */

diff --git a/src/pakfire/xfer.h b/src/pakfire/xfer.h
index 1c9f6f58b3d0b629b665c425379b0787e375a33d..57317620e7073495137ab8ffe5710df4b95d5913 100644 (file)
--- a/src/pakfire/xfer.h
+++ b/src/pakfire/xfer.h
@@ -21,8 +21,6 @@
 #ifndef PAKFIRE_XFER_H
 #define PAKFIRE_XFER_H
 
-#ifdef PAKFIRE_PRIVATE
-
 #include <stdarg.h>
 
 #include <curl/curl.h>
@@ -146,5 +144,4 @@ int pakfire_xfer_socket(struct pakfire_xfer* xfer, pakfire_xfer_open_callback op
 int pakfire_xfer_send_message(struct pakfire_xfer* xfer, const char* message, const size_t length);
 #endif /* CURL_HAS_WEBSOCKETS */
 
-#endif /* PAKFIRE_PRIVATE */
 #endif /* PAKFIRE_XFER_H */