master hovercats/oakiss / pkg / pciutils / patch / 0001-Avoid-empty-top-level-declarations.patch 
  1From 346f1dd1d0b3749a5e579f04f9ab07497ed4f92c Mon Sep 17 00:00:00 2001
  2From: Michael Forney <mforney@mforney.org>
  3Date: Sun, 16 Aug 2020 16:14:04 -0700
  4Subject: [PATCH] Avoid empty top-level declarations
  5
  6These are not allowed in ISO C.
  7---
  8 lib/access.c | 32 ++++++++++++++++----------------
  9 lib/filter.c | 46 +++++++++++++++++++++++-----------------------
 10 lib/init.c   |  8 ++++----
 11 3 files changed, 43 insertions(+), 43 deletions(-)
 12
 13diff --git a/lib/access.c b/lib/access.c
 14index baaabcb..be97943 100644
 15--- a/lib/access.c
 16+++ b/lib/access.c
 17@@ -206,22 +206,22 @@ pci_fill_info_v313(struct pci_dev *d, int flags)
 18 
 19 /* In version 3.1, pci_fill_info got new flags => versioned alias */
 20 /* In versions 3.2, 3.3, 3.4, 3.5, 3.8 and 3.12, the same has happened */
 21-STATIC_ALIAS(int pci_fill_info(struct pci_dev *d, int flags), pci_fill_info_v313(d, flags));
 22-DEFINE_ALIAS(int pci_fill_info_v30(struct pci_dev *d, int flags), pci_fill_info_v313);
 23-DEFINE_ALIAS(int pci_fill_info_v31(struct pci_dev *d, int flags), pci_fill_info_v313);
 24-DEFINE_ALIAS(int pci_fill_info_v32(struct pci_dev *d, int flags), pci_fill_info_v313);
 25-DEFINE_ALIAS(int pci_fill_info_v33(struct pci_dev *d, int flags), pci_fill_info_v313);
 26-DEFINE_ALIAS(int pci_fill_info_v34(struct pci_dev *d, int flags), pci_fill_info_v313);
 27-DEFINE_ALIAS(int pci_fill_info_v35(struct pci_dev *d, int flags), pci_fill_info_v313);
 28-DEFINE_ALIAS(int pci_fill_info_v38(struct pci_dev *d, int flags), pci_fill_info_v313);
 29-SYMBOL_VERSION(pci_fill_info_v30, pci_fill_info@LIBPCI_3.0);
 30-SYMBOL_VERSION(pci_fill_info_v31, pci_fill_info@LIBPCI_3.1);
 31-SYMBOL_VERSION(pci_fill_info_v32, pci_fill_info@LIBPCI_3.2);
 32-SYMBOL_VERSION(pci_fill_info_v33, pci_fill_info@LIBPCI_3.3);
 33-SYMBOL_VERSION(pci_fill_info_v34, pci_fill_info@LIBPCI_3.4);
 34-SYMBOL_VERSION(pci_fill_info_v35, pci_fill_info@LIBPCI_3.5);
 35-SYMBOL_VERSION(pci_fill_info_v38, pci_fill_info@LIBPCI_3.8);
 36-SYMBOL_VERSION(pci_fill_info_v313, pci_fill_info@@LIBPCI_3.13);
 37+STATIC_ALIAS(int pci_fill_info(struct pci_dev *d, int flags), pci_fill_info_v313(d, flags))
 38+DEFINE_ALIAS(int pci_fill_info_v30(struct pci_dev *d, int flags), pci_fill_info_v313)
 39+DEFINE_ALIAS(int pci_fill_info_v31(struct pci_dev *d, int flags), pci_fill_info_v313)
 40+DEFINE_ALIAS(int pci_fill_info_v32(struct pci_dev *d, int flags), pci_fill_info_v313)
 41+DEFINE_ALIAS(int pci_fill_info_v33(struct pci_dev *d, int flags), pci_fill_info_v313)
 42+DEFINE_ALIAS(int pci_fill_info_v34(struct pci_dev *d, int flags), pci_fill_info_v313)
 43+DEFINE_ALIAS(int pci_fill_info_v35(struct pci_dev *d, int flags), pci_fill_info_v313)
 44+DEFINE_ALIAS(int pci_fill_info_v38(struct pci_dev *d, int flags), pci_fill_info_v313)
 45+SYMBOL_VERSION(pci_fill_info_v30, pci_fill_info@LIBPCI_3.0)
 46+SYMBOL_VERSION(pci_fill_info_v31, pci_fill_info@LIBPCI_3.1)
 47+SYMBOL_VERSION(pci_fill_info_v32, pci_fill_info@LIBPCI_3.2)
 48+SYMBOL_VERSION(pci_fill_info_v33, pci_fill_info@LIBPCI_3.3)
 49+SYMBOL_VERSION(pci_fill_info_v34, pci_fill_info@LIBPCI_3.4)
 50+SYMBOL_VERSION(pci_fill_info_v35, pci_fill_info@LIBPCI_3.5)
 51+SYMBOL_VERSION(pci_fill_info_v38, pci_fill_info@LIBPCI_3.8)
 52+SYMBOL_VERSION(pci_fill_info_v313, pci_fill_info@@LIBPCI_3.13)
 53 
 54 void
 55 pci_setup_cache(struct pci_dev *d, byte *cache, int len)
 56diff --git a/lib/filter.c b/lib/filter.c
 57index 4221f57..441eb51 100644
 58--- a/lib/filter.c
 59+++ b/lib/filter.c
 60@@ -309,26 +309,26 @@ pci_filter_match_v30(struct pci_filter_v30 *f, struct pci_dev *d)
 61 // Version 3.3 is the same as version 3.8, only device_class_mask and prog_if were not implemented
 62 // (their positions in struct pci_filter were declared as RFU).
 63 
 64-STATIC_ALIAS(void pci_filter_init(struct pci_access *a, struct pci_filter *f), pci_filter_init_v38(a, f));
 65-DEFINE_ALIAS(void pci_filter_init_v33(struct pci_access *a, struct pci_filter *f), pci_filter_init_v38);
 66-SYMBOL_VERSION(pci_filter_init_v30, pci_filter_init@LIBPCI_3.0);
 67-SYMBOL_VERSION(pci_filter_init_v33, pci_filter_init@LIBPCI_3.3);
 68-SYMBOL_VERSION(pci_filter_init_v38, pci_filter_init@@LIBPCI_3.8);
 69-
 70-STATIC_ALIAS(char *pci_filter_parse_slot(struct pci_filter *f, char *str), pci_filter_parse_slot_v38(f, str));
 71-DEFINE_ALIAS(char *pci_filter_parse_slot_v33(struct pci_filter *f, char *str), pci_filter_parse_slot_v38);
 72-SYMBOL_VERSION(pci_filter_parse_slot_v30, pci_filter_parse_slot@LIBPCI_3.0);
 73-SYMBOL_VERSION(pci_filter_parse_slot_v33, pci_filter_parse_slot@LIBPCI_3.3);
 74-SYMBOL_VERSION(pci_filter_parse_slot_v38, pci_filter_parse_slot@@LIBPCI_3.8);
 75-
 76-STATIC_ALIAS(char *pci_filter_parse_id(struct pci_filter *f, char *str), pci_filter_parse_id_v38(f, str));
 77-DEFINE_ALIAS(char *pci_filter_parse_id_v33(struct pci_filter *f, char *str), pci_filter_parse_id_v38);
 78-SYMBOL_VERSION(pci_filter_parse_id_v30, pci_filter_parse_id@LIBPCI_3.0);
 79-SYMBOL_VERSION(pci_filter_parse_id_v33, pci_filter_parse_id@LIBPCI_3.3);
 80-SYMBOL_VERSION(pci_filter_parse_id_v38, pci_filter_parse_id@@LIBPCI_3.8);
 81-
 82-STATIC_ALIAS(int pci_filter_match(struct pci_filter *f, struct pci_dev *d), pci_filter_match_v38(f, d));
 83-DEFINE_ALIAS(int pci_filter_match_v33(struct pci_filter *f, struct pci_dev *d), pci_filter_match_v38);
 84-SYMBOL_VERSION(pci_filter_match_v30, pci_filter_match@LIBPCI_3.0);
 85-SYMBOL_VERSION(pci_filter_match_v33, pci_filter_match@LIBPCI_3.3);
 86-SYMBOL_VERSION(pci_filter_match_v38, pci_filter_match@@LIBPCI_3.8);
 87+STATIC_ALIAS(void pci_filter_init(struct pci_access *a, struct pci_filter *f), pci_filter_init_v38(a, f))
 88+DEFINE_ALIAS(void pci_filter_init_v33(struct pci_access *a, struct pci_filter *f), pci_filter_init_v38)
 89+SYMBOL_VERSION(pci_filter_init_v30, pci_filter_init@LIBPCI_3.0)
 90+SYMBOL_VERSION(pci_filter_init_v33, pci_filter_init@LIBPCI_3.3)
 91+SYMBOL_VERSION(pci_filter_init_v38, pci_filter_init@@LIBPCI_3.8)
 92+
 93+STATIC_ALIAS(char *pci_filter_parse_slot(struct pci_filter *f, char *str), pci_filter_parse_slot_v38(f, str))
 94+DEFINE_ALIAS(char *pci_filter_parse_slot_v33(struct pci_filter *f, char *str), pci_filter_parse_slot_v38)
 95+SYMBOL_VERSION(pci_filter_parse_slot_v30, pci_filter_parse_slot@LIBPCI_3.0)
 96+SYMBOL_VERSION(pci_filter_parse_slot_v33, pci_filter_parse_slot@LIBPCI_3.3)
 97+SYMBOL_VERSION(pci_filter_parse_slot_v38, pci_filter_parse_slot@@LIBPCI_3.8)
 98+
 99+STATIC_ALIAS(char *pci_filter_parse_id(struct pci_filter *f, char *str), pci_filter_parse_id_v38(f, str))
100+DEFINE_ALIAS(char *pci_filter_parse_id_v33(struct pci_filter *f, char *str), pci_filter_parse_id_v38)
101+SYMBOL_VERSION(pci_filter_parse_id_v30, pci_filter_parse_id@LIBPCI_3.0)
102+SYMBOL_VERSION(pci_filter_parse_id_v33, pci_filter_parse_id@LIBPCI_3.3)
103+SYMBOL_VERSION(pci_filter_parse_id_v38, pci_filter_parse_id@@LIBPCI_3.8)
104+
105+STATIC_ALIAS(int pci_filter_match(struct pci_filter *f, struct pci_dev *d), pci_filter_match_v38(f, d))
106+DEFINE_ALIAS(int pci_filter_match_v33(struct pci_filter *f, struct pci_dev *d), pci_filter_match_v38)
107+SYMBOL_VERSION(pci_filter_match_v30, pci_filter_match@LIBPCI_3.0)
108+SYMBOL_VERSION(pci_filter_match_v33, pci_filter_match@LIBPCI_3.3)
109+SYMBOL_VERSION(pci_filter_match_v38, pci_filter_match@@LIBPCI_3.8)
110diff --git a/lib/init.c b/lib/init.c
111index b0e5018..9867a47 100644
112--- a/lib/init.c
113+++ b/lib/init.c
114@@ -531,10 +531,10 @@ pci_init_v35(struct pci_access *a)
115     a->error("Cannot find any working access method.");
116 }
117 
118-STATIC_ALIAS(void pci_init(struct pci_access *a), pci_init_v35(a));
119-DEFINE_ALIAS(void pci_init_v30(struct pci_access *a), pci_init_v35);
120-SYMBOL_VERSION(pci_init_v30, pci_init@LIBPCI_3.0);
121-SYMBOL_VERSION(pci_init_v35, pci_init@@LIBPCI_3.5);
122+STATIC_ALIAS(void pci_init(struct pci_access *a), pci_init_v35(a))
123+DEFINE_ALIAS(void pci_init_v30(struct pci_access *a), pci_init_v35)
124+SYMBOL_VERSION(pci_init_v30, pci_init@LIBPCI_3.0)
125+SYMBOL_VERSION(pci_init_v35, pci_init@@LIBPCI_3.5)
126 
127 struct pci_access *
128 pci_clone_access(struct pci_access *a)
129-- 
1302.49.0
131