Since uuid.lib includes oledb.h, we get duplicate symbols in adsiid since uuid.lib is linked.
Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com --- include/oledb.idl | 1 + libs/adsiid/adsiid.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/oledb.idl b/include/oledb.idl index 49c0c304b2d..b889d72bc38 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -79,6 +79,7 @@ typedef LONG_PTR DB_LRESERVE; #include "rstchg.idl" #include "rstupd.idl" #include "mulres.idl" +#include "transact.idl" #include "cmdwpr.idl"
cpp_quote("#include <accctrl.h>") diff --git a/libs/adsiid/adsiid.c b/libs/adsiid/adsiid.c index fc0b8b1bf4e..e4e85d89b84 100644 --- a/libs/adsiid/adsiid.c +++ b/libs/adsiid/adsiid.c @@ -25,4 +25,3 @@ #include "initguid.h"
#include "iads.h" -#include "transact.h"