X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Finternal.h;h=cbac2a7eda0ec16aeb38665c689b16f0ffab2f1e;hb=c4cf2d1c17594d333ccd819212756e3afb8b9924;hp=18a59e2e02db7f02090d93bc3851ae934ff841ee;hpb=6e4adbf543f889d9bcdb296a86a7333ef4b6507b;p=pciutils.git

diff --git a/lib/internal.h b/lib/internal.h
index 18a59e2..cbac2a7 100644
--- a/lib/internal.h
+++ b/lib/internal.h
@@ -13,18 +13,18 @@
 // Functions, which are bound to externally visible symbols by the versioning
 // mechanism, have to be declared as VERSIONED. Otherwise, GCC with global
 // optimizations is happy to optimize them away, leading to linker failures.
-#define VERSIONED __attribute__((used))
+#define VERSIONED_ABI __attribute__((used)) PCI_ABI
 #ifdef __APPLE__
 #define STATIC_ALIAS(_decl, _for) _decl PCI_ABI { return _for; }
-#define DEFINE_ALIAS(_decl, _for) extern _decl __attribute__((alias(#_for)))
-#define SYMBOL_VERSION(_int, _ext) asm(".symver " #_int "," #_ext)
-#else
-#define STATIC_ALIAS(_decl, _for)
 #define DEFINE_ALIAS(_decl, _for)
 #define SYMBOL_VERSION(_int, _ext)
+#else
+#define STATIC_ALIAS(_decl, _for)
+#define DEFINE_ALIAS(_decl, _for) extern _decl __attribute__((alias(#_for)))
+#define SYMBOL_VERSION(_int, _ext) asm(".symver " #_int "," #_ext)
 #endif
 #else
-#define VERSIONED
+#define VERSIONED_ABI
 #define STATIC_ALIAS(_decl, _for) _decl { return _for; }
 #define DEFINE_ALIAS(_decl, _for)
 #define SYMBOL_VERSION(_int, _ext)
@@ -59,15 +59,21 @@ int pci_generic_block_write(struct pci_dev *, int pos, byte *buf, int len);
 /* init.c */
 void *pci_malloc(struct pci_access *, int);
 void pci_mfree(void *);
-char *pci_strdup(struct pci_access *a, char *s);
+char *pci_strdup(struct pci_access *a, const char *s);
+
+void pci_init_v30(struct pci_access *a) VERSIONED_ABI;
+void pci_init_v35(struct pci_access *a) VERSIONED_ABI;
 
 /* access.c */
 struct pci_dev *pci_alloc_dev(struct pci_access *);
 int pci_link_dev(struct pci_access *, struct pci_dev *);
 
-int pci_fill_info_v30(struct pci_dev *, int flags) PCI_ABI;
-int pci_fill_info_v31(struct pci_dev *, int flags) PCI_ABI;
-int pci_fill_info_v32(struct pci_dev *, int flags) PCI_ABI;
+int pci_fill_info_v30(struct pci_dev *, int flags) VERSIONED_ABI;
+int pci_fill_info_v31(struct pci_dev *, int flags) VERSIONED_ABI;
+int pci_fill_info_v32(struct pci_dev *, int flags) VERSIONED_ABI;
+int pci_fill_info_v33(struct pci_dev *, int flags) VERSIONED_ABI;
+int pci_fill_info_v34(struct pci_dev *, int flags) VERSIONED_ABI;
+int pci_fill_info_v35(struct pci_dev *, int flags) VERSIONED_ABI;
 
 /* params.c */
 void pci_define_param(struct pci_access *acc, char *param, char *val, char *help);