diff options
author | Dan Nicholson <dbn.lists@gmail.com> | 2013-01-22 05:11:59 -0800 |
---|---|---|
committer | Dan Nicholson <dbn.lists@gmail.com> | 2013-01-22 05:11:59 -0800 |
commit | 1694230365b2518797d13fdbfd4b7578ce89f00e (patch) | |
tree | 595ec4e9822c2581a47f87fd89eff08dd5214352 /pkg.h | |
parent | 7867cbd79cfe706b990bcc0e4c6846007be76e8a (diff) | |
parent | 9adfd9ebfcb8a9656999116307c15061364bf7df (diff) | |
download | pkg-config-1694230365b2518797d13fdbfd4b7578ce89f00e.tar.gz |
Merge branch 'flag-order-fixes'
Diffstat (limited to 'pkg.h')
-rw-r--r-- | pkg.h | 14 |
1 files changed, 9 insertions, 5 deletions
@@ -45,9 +45,16 @@ typedef enum ALWAYS_MATCH } ComparisonType; +typedef struct _Flag Flag; typedef struct _Package Package; typedef struct _RequiredVersion RequiredVersion; +struct _Flag +{ + FlagType type; + char *arg; +}; + struct _RequiredVersion { char *name; @@ -68,11 +75,8 @@ struct _Package GList *requires; GList *requires_private_entries; GList *requires_private; - GList *l_libs; - GList *L_libs; - GList *other_libs; - GList *I_cflags; - GList *other_cflags; + GList *libs; + GList *cflags; GHashTable *vars; GHashTable *required_versions; /* hash from name to RequiredVersion */ GList *conflicts; /* list of RequiredVersion */ |