logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0001-Avoid-empty-top-level-declarations.patch (5564B)

    

  1. From 0ff37625c4e1d7835fed885de5f9ef6ec642ffe6 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Sun, 16 Aug 2020 16:14:04 -0700
  4. Subject: [PATCH] Avoid empty top-level declarations
  6. These are not allowed in ISO C.
  7. ---
  8.  lib/access.c | 24 ++++++++++++------------
  9.  lib/filter.c | 24 ++++++++++++------------
  10.  lib/init.c   |  8 ++++----
  11.  3 files changed, 28 insertions(+), 28 deletions(-)
  13. diff --git a/lib/access.c b/lib/access.c
  14. index b257849..139924f 100644
  15. --- a/lib/access.c
  16. +++ b/lib/access.c
  17. @@ -204,18 +204,18 @@ pci_fill_info_v35(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 and 3.5, the same has happened */
  21. -STATIC_ALIAS(int pci_fill_info(struct pci_dev *d, int flags), pci_fill_info_v35(d, flags));
  22. -DEFINE_ALIAS(int pci_fill_info_v30(struct pci_dev *d, int flags), pci_fill_info_v35);
  23. -DEFINE_ALIAS(int pci_fill_info_v31(struct pci_dev *d, int flags), pci_fill_info_v35);
  24. -DEFINE_ALIAS(int pci_fill_info_v32(struct pci_dev *d, int flags), pci_fill_info_v35);
  25. -DEFINE_ALIAS(int pci_fill_info_v33(struct pci_dev *d, int flags), pci_fill_info_v35);
  26. -DEFINE_ALIAS(int pci_fill_info_v34(struct pci_dev *d, int flags), pci_fill_info_v35);
  27. -SYMBOL_VERSION(pci_fill_info_v30, pci_fill_info@LIBPCI_3.0);
  28. -SYMBOL_VERSION(pci_fill_info_v31, pci_fill_info@LIBPCI_3.1);
  29. -SYMBOL_VERSION(pci_fill_info_v32, pci_fill_info@LIBPCI_3.2);
  30. -SYMBOL_VERSION(pci_fill_info_v33, pci_fill_info@LIBPCI_3.3);
  31. -SYMBOL_VERSION(pci_fill_info_v34, pci_fill_info@LIBPCI_3.4);
  32. -SYMBOL_VERSION(pci_fill_info_v35, pci_fill_info@@LIBPCI_3.5);
  33. +STATIC_ALIAS(int pci_fill_info(struct pci_dev *d, int flags), pci_fill_info_v35(d, flags))
  34. +DEFINE_ALIAS(int pci_fill_info_v30(struct pci_dev *d, int flags), pci_fill_info_v35)
  35. +DEFINE_ALIAS(int pci_fill_info_v31(struct pci_dev *d, int flags), pci_fill_info_v35)
  36. +DEFINE_ALIAS(int pci_fill_info_v32(struct pci_dev *d, int flags), pci_fill_info_v35)
  37. +DEFINE_ALIAS(int pci_fill_info_v33(struct pci_dev *d, int flags), pci_fill_info_v35)
  38. +DEFINE_ALIAS(int pci_fill_info_v34(struct pci_dev *d, int flags), pci_fill_info_v35)
  39. +SYMBOL_VERSION(pci_fill_info_v30, pci_fill_info@LIBPCI_3.0)
  40. +SYMBOL_VERSION(pci_fill_info_v31, pci_fill_info@LIBPCI_3.1)
  41. +SYMBOL_VERSION(pci_fill_info_v32, pci_fill_info@LIBPCI_3.2)
  42. +SYMBOL_VERSION(pci_fill_info_v33, pci_fill_info@LIBPCI_3.3)
  43. +SYMBOL_VERSION(pci_fill_info_v34, pci_fill_info@LIBPCI_3.4)
  44. +SYMBOL_VERSION(pci_fill_info_v35, pci_fill_info@@LIBPCI_3.5)
  45.  
  46.  void
  47.  pci_setup_cache(struct pci_dev *d, byte *cache, int len)
  48. diff --git a/lib/filter.c b/lib/filter.c
  49. index 573fb28..7ca56a8 100644
  50. --- a/lib/filter.c
  51. +++ b/lib/filter.c
  52. @@ -223,18 +223,18 @@ pci_filter_match_v30(struct pci_filter_v30 *f, struct pci_dev *d)
  53.    return pci_filter_match_v33(&new, d);
  54.  }
  55.  
  56. -STATIC_ALIAS(void pci_filter_init(struct pci_access *a, struct pci_filter *f), pci_filter_init_v33(a, f));
  57. -SYMBOL_VERSION(pci_filter_init_v30, pci_filter_init@LIBPCI_3.0);
  58. -SYMBOL_VERSION(pci_filter_init_v33, pci_filter_init@@LIBPCI_3.3);
  59. +STATIC_ALIAS(void pci_filter_init(struct pci_access *a, struct pci_filter *f), pci_filter_init_v33(a, f))
  60. +SYMBOL_VERSION(pci_filter_init_v30, pci_filter_init@LIBPCI_3.0)
  61. +SYMBOL_VERSION(pci_filter_init_v33, pci_filter_init@@LIBPCI_3.3)
  62.  
  63. -STATIC_ALIAS(char *pci_filter_parse_slot(struct pci_filter *f, char *str), pci_filter_parse_slot_v33(f, str));
  64. -SYMBOL_VERSION(pci_filter_parse_slot_v30, pci_filter_parse_slot@LIBPCI_3.0);
  65. -SYMBOL_VERSION(pci_filter_parse_slot_v33, pci_filter_parse_slot@@LIBPCI_3.3);
  66. +STATIC_ALIAS(char *pci_filter_parse_slot(struct pci_filter *f, char *str), pci_filter_parse_slot_v33(f, str))
  67. +SYMBOL_VERSION(pci_filter_parse_slot_v30, pci_filter_parse_slot@LIBPCI_3.0)
  68. +SYMBOL_VERSION(pci_filter_parse_slot_v33, pci_filter_parse_slot@@LIBPCI_3.3)
  69.  
  70. -STATIC_ALIAS(char *pci_filter_parse_id(struct pci_filter *f, char *str), pci_filter_parse_id_v33(f, str));
  71. -SYMBOL_VERSION(pci_filter_parse_id_v30, pci_filter_parse_id@LIBPCI_3.0);
  72. -SYMBOL_VERSION(pci_filter_parse_id_v33, pci_filter_parse_id@@LIBPCI_3.3);
  73. +STATIC_ALIAS(char *pci_filter_parse_id(struct pci_filter *f, char *str), pci_filter_parse_id_v33(f, str))
  74. +SYMBOL_VERSION(pci_filter_parse_id_v30, pci_filter_parse_id@LIBPCI_3.0)
  75. +SYMBOL_VERSION(pci_filter_parse_id_v33, pci_filter_parse_id@@LIBPCI_3.3)
  76.  
  77. -STATIC_ALIAS(int pci_filter_match(struct pci_filter *f, struct pci_dev *d), pci_filter_match_v33(f, d));
  78. -SYMBOL_VERSION(pci_filter_match_v30, pci_filter_match@LIBPCI_3.0);
  79. -SYMBOL_VERSION(pci_filter_match_v33, pci_filter_match@@LIBPCI_3.3);
  80. +STATIC_ALIAS(int pci_filter_match(struct pci_filter *f, struct pci_dev *d), pci_filter_match_v33(f, d))
  81. +SYMBOL_VERSION(pci_filter_match_v30, pci_filter_match@LIBPCI_3.0)
  82. +SYMBOL_VERSION(pci_filter_match_v33, pci_filter_match@@LIBPCI_3.3)
  83. diff --git a/lib/init.c b/lib/init.c
  84. index e6295fc..4703dbd 100644
  85. --- a/lib/init.c
  86. +++ b/lib/init.c
  87. @@ -245,10 +245,10 @@ pci_init_v35(struct pci_access *a)
  88.    a->methods->init(a);
  89.  }
  90.  
  91. -STATIC_ALIAS(void pci_init(struct pci_access *a), pci_init_v35(a));
  92. -DEFINE_ALIAS(void pci_init_v30(struct pci_access *a), pci_init_v35);
  93. -SYMBOL_VERSION(pci_init_v30, pci_init@LIBPCI_3.0);
  94. -SYMBOL_VERSION(pci_init_v35, pci_init@@LIBPCI_3.5);
  95. +STATIC_ALIAS(void pci_init(struct pci_access *a), pci_init_v35(a))
  96. +DEFINE_ALIAS(void pci_init_v30(struct pci_access *a), pci_init_v35)
  97. +SYMBOL_VERSION(pci_init_v30, pci_init@LIBPCI_3.0)
  98. +SYMBOL_VERSION(pci_init_v35, pci_init@@LIBPCI_3.5)
  99.  
  100.  void
  101.  pci_cleanup(struct pci_access *a)
  102. -- 
  103. 2.28.0