提交 655a99f1 编写于 作者: D Dawid Zamirski 提交者: John Ferlan

vbox: remove calls to *InstallUniformedAPI macros.

That is, for versions older than 4.0. Also do not try to include
headers for those old versions.
上级 7f10ac33
...@@ -410,15 +410,7 @@ typedef nsISupports IKeyboard; ...@@ -410,15 +410,7 @@ typedef nsISupports IKeyboard;
# define installUniformedAPI(gVBoxAPI, result) \ # define installUniformedAPI(gVBoxAPI, result) \
do { \ do { \
result = 0; \ result = 0; \
if (uVersion >= 2001052 && uVersion < 2002051) { \ if (uVersion >= 3002051 && uVersion < 4000051) { \
vbox22InstallUniformedAPI(&gVBoxAPI); \
} else if (uVersion >= 2002051 && uVersion < 3000051) { \
vbox30InstallUniformedAPI(&gVBoxAPI); \
} else if (uVersion >= 3000051 && uVersion < 3001051) { \
vbox31InstallUniformedAPI(&gVBoxAPI); \
} else if (uVersion >= 3001051 && uVersion < 3002051) { \
vbox32InstallUniformedAPI(&gVBoxAPI); \
} else if (uVersion >= 3002051 && uVersion < 4000051) { \
vbox40InstallUniformedAPI(&gVBoxAPI); \ vbox40InstallUniformedAPI(&gVBoxAPI); \
} else if (uVersion >= 4000051 && uVersion < 4001051) { \ } else if (uVersion >= 4000051 && uVersion < 4001051) { \
vbox41InstallUniformedAPI(&gVBoxAPI); \ vbox41InstallUniformedAPI(&gVBoxAPI); \
......
...@@ -888,15 +888,7 @@ virStorageDriverPtr vboxGetStorageDriver(uint32_t uVersion) ...@@ -888,15 +888,7 @@ virStorageDriverPtr vboxGetStorageDriver(uint32_t uVersion)
/* Install gVBoxAPI according to the vbox API version. /* Install gVBoxAPI according to the vbox API version.
* Return -1 for unsupported version. * Return -1 for unsupported version.
*/ */
if (uVersion >= 2001052 && uVersion < 2002051) { if (uVersion >= 3002051 && uVersion < 4000051) {
vbox22InstallUniformedAPI(&gVBoxAPI);
} else if (uVersion >= 2002051 && uVersion < 3000051) {
vbox30InstallUniformedAPI(&gVBoxAPI);
} else if (uVersion >= 3000051 && uVersion < 3001051) {
vbox31InstallUniformedAPI(&gVBoxAPI);
} else if (uVersion >= 3001051 && uVersion < 3002051) {
vbox32InstallUniformedAPI(&gVBoxAPI);
} else if (uVersion >= 3002051 && uVersion < 4000051) {
vbox40InstallUniformedAPI(&gVBoxAPI); vbox40InstallUniformedAPI(&gVBoxAPI);
} else if (uVersion >= 4000051 && uVersion < 4001051) { } else if (uVersion >= 4000051 && uVersion < 4001051) {
vbox41InstallUniformedAPI(&gVBoxAPI); vbox41InstallUniformedAPI(&gVBoxAPI);
......
...@@ -616,10 +616,6 @@ virDomainPtr vboxDomainLookupByUUID(virConnectPtr conn, ...@@ -616,10 +616,6 @@ virDomainPtr vboxDomainLookupByUUID(virConnectPtr conn,
const unsigned char *uuid); const unsigned char *uuid);
/* Version specified functions for installing uniformed API */ /* Version specified functions for installing uniformed API */
void vbox22InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
void vbox30InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
void vbox31InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
void vbox32InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
void vbox40InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); void vbox40InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
void vbox41InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); void vbox41InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
void vbox42InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); void vbox42InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册