X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Finternal.h;h=68e9fa0756c66114f296d0e7e05c72da70c3190e;hb=42fc4263ec0e35ba6a5ac7c32956e25b4551c907;hp=ba07d26a7087afb7a71c5a94706087a0dcafc2e5;hpb=5b52ae794a6fcf77363a78a42278da8a4feaf225;p=pciutils.git diff --git a/lib/internal.h b/lib/internal.h index ba07d26..68e9fa0 100644 --- a/lib/internal.h +++ b/lib/internal.h @@ -20,18 +20,19 @@ // optimizations is happy to optimize them away, leading to linker failures. #define VERSIONED_ABI __attribute__((used)) PCI_ABI #ifdef __APPLE__ -#define STATIC_ALIAS(_decl, _for) _decl VERSIONED_ABI { return _for; } +#define STATIC_ALIAS(_decl, _for) VERSIONED_ABI _decl { return _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))) VERSIONED_ABI #ifdef _WIN32 +#define STATIC_ALIAS(_decl, _for) VERSIONED_ABI _decl { return _for; } /* GCC does not support asm .symver directive for Windows targets, so define new external global function symbol as alias to internal symbol */ #define SYMBOL_VERSION(_int, _ext) asm(".globl\t" PCI_STRINGIFY(__MINGW_USYMBOL(_ext)) "\n\t" \ ".def\t" PCI_STRINGIFY(__MINGW_USYMBOL(_ext)) ";\t.scl\t2;\t.type\t32;\t.endef\n\t" \ ".set\t" PCI_STRINGIFY(__MINGW_USYMBOL(_ext)) "," PCI_STRINGIFY(__MINGW_USYMBOL(_int))) #else +#define STATIC_ALIAS(_decl, _for) #define SYMBOL_VERSION(_int, _ext) asm(".symver " #_int "," #_ext) #endif #endif @@ -130,7 +131,7 @@ struct pci_property { char *pci_set_property(struct pci_dev *d, u32 key, char *value); /* params.c */ -void pci_define_param(struct pci_access *acc, char *param, char *val, char *help); +struct pci_param *pci_define_param(struct pci_access *acc, char *param, char *val, char *help); int pci_set_param_internal(struct pci_access *acc, char *param, char *val, int copy); void pci_free_params(struct pci_access *acc);