diff --git a/lib/pgut/pgut-be.h b/lib/pgut/pgut-be.h
index cb5436f..aafacd2 100755
--- a/lib/pgut/pgut-be.h
+++ b/lib/pgut/pgut-be.h
@@ -155,6 +155,9 @@ extern void tuplestore_putvalues(Tuplestorestate *state, TupleDesc tdesc,
#define ATExecChangeOwner(relationOid, newOwnerId, recursing, lockmode) \
ATExecChangeOwner((relationOid), (newOwnerId), (recursing))
+#define deleteDependencyRecordsFor(classId, objectId, skipExtensionDeps) \
+ deleteDependencyRecordsFor((classId), (objectId))
+
#endif
#if PG_VERSION_NUM < 80300
diff --git a/lib/reorg.c b/lib/reorg.c
index 0b836d0..0872f58 100755
--- a/lib/reorg.c
+++ b/lib/reorg.c
@@ -1121,7 +1121,8 @@ swap_heap_or_index_files(Oid r1, Oid r2)
if (relform1->reltoastrelid)
{
count = deleteDependencyRecordsFor(RelationRelationId,
- relform1->reltoastrelid);
+ relform1->reltoastrelid,
+ false);
if (count != 1)
elog(ERROR, "expected one dependency record for TOAST table, found %ld",
count);
@@ -1129,7 +1130,8 @@ swap_heap_or_index_files(Oid r1, Oid r2)
if (relform2->reltoastrelid)
{
count = deleteDependencyRecordsFor(RelationRelationId,
- relform2->reltoastrelid);
+ relform2->reltoastrelid,
+ false);
if (count != 1)
elog(ERROR, "expected one dependency record for TOAST table, found %ld",
count);
diff --git a/msvc/bin.2010.vcxproj b/msvc/bin.2010.vcxproj
index d8cbe27..6e13d12 100644
--- a/msvc/bin.2010.vcxproj
+++ b/msvc/bin.2010.vcxproj
@@ -92,17 +92,17 @@
<_ProjectFileVersion>10.0.30319.1
- $(SolutionDir)/bin/$(Platform)/$(Configuration)/bin/
+ $(SolutionDir)/bin/x86/$(Configuration)/bin/
$(SolutionDir)/bin/$(Platform)/$(Configuration)/bin/
- $(SolutionDir)/bin/$(Platform)/$(Configuration)/bin/
+ $(SolutionDir)/bin/x86/$(Configuration)/bin/
$(SolutionDir)/bin/$(Platform)/$(Configuration)/bin/
- $(SolutionDir)/bin/$(Platform)/$(Configuration)/bin/
+ $(SolutionDir)/bin/x86/$(Configuration)/bin/
$(SolutionDir)/bin/$(Platform)/$(Configuration)/bin/
- $(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/
+ $(SolutionDir)/obj/x86/$(Configuration)/$(ProjectName)/
$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/
- $(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/
+ $(SolutionDir)/obj/x86/$(Configuration)/$(ProjectName)/
$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/
- $(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/
+ $(SolutionDir)/obj/x86/$(Configuration)/$(ProjectName)/
$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/
false
false
@@ -146,7 +146,7 @@
4005;4996;4018;%(DisableSpecificWarnings)
- kernel32.lib;advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl-8.lib
+ advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl-8.lib
$(OutDir)/$(TargetFileName)
false
Console
@@ -176,7 +176,7 @@
4005;4996;4018;%(DisableSpecificWarnings)
- kernel32.lib;advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl.lib
+ advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl.lib
$(OutDir)/$(TargetFileName)
false
Console
@@ -205,7 +205,7 @@
4005;4996;4018;%(DisableSpecificWarnings)
- kernel32.lib;advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl-8.lib
+ advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl-8.lib
$(OutDir)/$(TargetFileName)
false
Console
@@ -264,7 +264,7 @@
4005;4996;4018;%(DisableSpecificWarnings)
- kernel32.lib;advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl-8.lib
+ advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl-8.lib
$(OutDir)/$(TargetFileName)
false
Console
diff --git a/msvc/lib.2010.vcxproj b/msvc/lib.2010.vcxproj
index f31a534..dde2fc4 100644
--- a/msvc/lib.2010.vcxproj
+++ b/msvc/lib.2010.vcxproj
@@ -106,17 +106,17 @@
<_ProjectFileVersion>10.0.30319.1
- $(SolutionDir)/bin/$(Platform)/$(Configuration)/lib/
+ $(SolutionDir)/bin/x86/$(Configuration)/lib/
$(SolutionDir)/bin/$(Platform)/$(Configuration)/lib/
- $(SolutionDir)/bin/$(Platform)/$(Configuration)/lib/
+ $(SolutionDir)/bin/x86/$(Configuration)/lib/
$(SolutionDir)/bin/$(Platform)/$(Configuration)/lib/
- $(SolutionDir)/bin/$(Platform)/$(Configuration)/lib/
+ $(SolutionDir)/bin/x86/$(Configuration)/lib/
$(SolutionDir)/bin/$(Platform)/$(Configuration)/lib/
- $(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/
+ $(SolutionDir)/obj/x86/$(Configuration)/$(ProjectName)/
$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/
- $(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/
+ $(SolutionDir)/obj/x86/$(Configuration)/$(ProjectName)/
$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/
- $(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/
+ $(SolutionDir)/obj/x86/$(Configuration)/$(ProjectName)/
$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/
false
false
@@ -160,7 +160,7 @@
4005;4996;4018;%(DisableSpecificWarnings)
- kernel32.lib;advapi32.lib;ws2_32.lib;postgres.lib
+ postgres.lib
$(OutDir)/$(TargetFileName)
false
Console
@@ -186,7 +186,7 @@
4005;4996;4018;%(DisableSpecificWarnings)
- kernel32.lib;advapi32.lib;ws2_32.lib;postgres.lib
+ postgres.lib
$(OutDir)/$(TargetFileName)
false
Console
@@ -211,7 +211,7 @@
4005;4996;4018;%(DisableSpecificWarnings)
- kernel32.lib;advapi32.lib;ws2_32.lib;postgres.lib;libpq.lib
+ postgres.lib
$(OutDir)/$(TargetFileName)
false
Console
@@ -237,7 +237,7 @@
4005;4996;4018;%(DisableSpecificWarnings)
- kernel32.lib;advapi32.lib;ws2_32.lib;postgres.lib;libpq.lib
+ postgres.lib
$(OutDir)/$(TargetFileName)
false
Console
@@ -262,7 +262,7 @@
4005;4996;4018;%(DisableSpecificWarnings)
- kernel32.lib;advapi32.lib;ws2_32.lib;postgres.lib;libpq.lib
+ postgres.lib
$(OutDir)/$(TargetFileName)
false
Console
@@ -288,7 +288,7 @@
4005;4996;4018;%(DisableSpecificWarnings)
- kernel32.lib;advapi32.lib;ws2_32.lib;postgres.lib;libpq.lib
+ postgres.lib
$(OutDir)/$(TargetFileName)
false
Console