mirror of
https://github.com/ipmitool/ipmitool.git
synced 2025-05-11 19:17:22 +00:00
use $name_intf_setup and create weak alias to intf_setup for each interface
so we don't have conflicts when both are compiled statically
This commit is contained in:
parent
90cd4acb4f
commit
187e25e658
@ -1161,9 +1161,10 @@ int ipmi_lan_open(struct ipmi_intf * intf, char * hostname, int port, char * use
|
|||||||
return intf->fd;
|
return intf->fd;
|
||||||
}
|
}
|
||||||
|
|
||||||
int intf_setup(struct ipmi_intf ** intf)
|
int lan_intf_setup(struct ipmi_intf ** intf)
|
||||||
{
|
{
|
||||||
*intf = &ipmi_lan_intf;
|
*intf = &ipmi_lan_intf;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int intf_setup(struct ipmi_intf ** intf) __attribute__ ((weak, alias("lan_intf_setup")));
|
||||||
|
@ -68,6 +68,7 @@ void ipmi_lan_close(struct ipmi_intf * intf);
|
|||||||
void ipmi_get_channel_info(struct ipmi_intf * intf, unsigned char channel);
|
void ipmi_get_channel_info(struct ipmi_intf * intf, unsigned char channel);
|
||||||
int ipmi_lan_ping(struct ipmi_intf * intf);
|
int ipmi_lan_ping(struct ipmi_intf * intf);
|
||||||
|
|
||||||
|
int lan_intf_setup(struct ipmi_intf ** intf);
|
||||||
struct ipmi_intf ipmi_lan_intf;
|
struct ipmi_intf ipmi_lan_intf;
|
||||||
|
|
||||||
#endif /*IPMI_LAN_H*/
|
#endif /*IPMI_LAN_H*/
|
||||||
|
@ -174,8 +174,10 @@ struct ipmi_rs * ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq
|
|||||||
return &rsp;
|
return &rsp;
|
||||||
}
|
}
|
||||||
|
|
||||||
int intf_setup(struct ipmi_intf ** intf)
|
int open_intf_setup(struct ipmi_intf ** intf)
|
||||||
{
|
{
|
||||||
*intf = &ipmi_openipmi_intf;
|
*intf = &ipmi_openipmi_intf;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int intf_setup(struct ipmi_intf ** intf) __attribute__ ((weak, alias("open_intf_setup")));
|
||||||
|
@ -44,5 +44,6 @@
|
|||||||
struct ipmi_rs * ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req);
|
struct ipmi_rs * ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req);
|
||||||
int ipmi_openipmi_open(struct ipmi_intf * intf, char * dev, int __unused1, char * __unused2, char * __unused3);
|
int ipmi_openipmi_open(struct ipmi_intf * intf, char * dev, int __unused1, char * __unused2, char * __unused3);
|
||||||
void ipmi_openipmi_close(struct ipmi_intf * intf);
|
void ipmi_openipmi_close(struct ipmi_intf * intf);
|
||||||
|
int open_intf_setup(struct ipmi_intf ** intf);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user