diff options
| author | Paul Barker <paul@paulbarker.me.uk> | 2013-11-20 10:29:36 (EST) |
|---|---|---|
| committer | Paul Barker <paul@paulbarker.me.uk> | 2013-12-17 16:00:35 (EST) |
| commit | 670879cbe91702c77da6494c2bc7102f5d014a0d (patch) | |
| tree | 56cc8207684a96d0e74db6f0cc0eaaa6942504bb | |
| parent | 93b7bcd9335071c85d0353d541d4ff72743333ea (diff) | |
libopkg: Drop config checks from structures in headers
Ensure that all structures are always the same size, regardless of configuration
options so that applications which use libopkg don't need to be rebuilt if
configuration options are changed.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Cc: Carsten Schoenert <c.schoenert@gmail.com>
| -rw-r--r-- | libopkg/opkg_conf.h | 13 | ||||
| -rw-r--r-- | libopkg/pkg.h | 2 | ||||
| -rw-r--r-- | libopkg/release.h | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h index 75b4cd6..29b65a7 100644 --- a/libopkg/opkg_conf.h +++ b/libopkg/opkg_conf.h @@ -88,8 +88,10 @@ struct opkg_conf int download_only; char *cache; -#ifdef HAVE_SSLCURL - /* some options could be used by + /* ssl-curl options: used only when opkg is configured with + * '--enable-ssl-curl', otherwise always NULL or 0. + * + * some options could be used by * wget if curl support isn't builtin * If someone want to try... */ @@ -102,10 +104,11 @@ struct opkg_conf char *ssl_ca_file; char *ssl_ca_path; int ssl_dont_verify_peer; -#endif -#ifdef HAVE_PATHFINDER + + /* pathfinder options: used only when opkg is configured with + * '--enable-pathfinder', otherwise always NULL or 0 as above. + */ int check_x509_path; -#endif /* proxy options */ char *http_proxy; diff --git a/libopkg/pkg.h b/libopkg/pkg.h index 5d468cb..1dc65a3 100644 --- a/libopkg/pkg.h +++ b/libopkg/pkg.h @@ -161,9 +161,7 @@ struct pkg char *local_filename; char *tmp_unpack_dir; char *md5sum; -#if defined HAVE_SHA256 char *sha256sum; -#endif unsigned long size; /* in bytes */ unsigned long installed_size; /* in bytes */ char *priority; diff --git a/libopkg/release.h b/libopkg/release.h index 239dcca..1c89c8e 100644 --- a/libopkg/release.h +++ b/libopkg/release.h @@ -29,9 +29,7 @@ struct release char **components; unsigned int components_count; cksum_list_t *md5sums; -#ifdef HAVE_SHA256 cksum_list_t *sha256sums; -#endif char **complist; unsigned int complist_count; }; |