The attempt to use ntquery.def.in to #include query.def didn't work
correctly for lib32.  For consistency, duplicate the version in
lib-common too.

Signed-off-by: Jeremy Drake <jeremyd2...@users.sourceforge.net>
---
 mingw-w64-crt/lib-common/ntquery.def    | 17 +++++++++++++++++
 mingw-w64-crt/lib-common/ntquery.def.in |  1 -
 mingw-w64-crt/lib32/ntquery.def         | 17 +++++++++++++++++
 mingw-w64-crt/lib32/ntquery.def.in      |  1 -
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 mingw-w64-crt/lib-common/ntquery.def
 delete mode 100644 mingw-w64-crt/lib-common/ntquery.def.in
 create mode 100644 mingw-w64-crt/lib32/ntquery.def
 delete mode 100644 mingw-w64-crt/lib32/ntquery.def.in
From 07803e562d698d06149d5e7ad71878c1efd1cee6 Mon Sep 17 00:00:00 2001
From: Jeremy Drake <jeremyd2...@users.sourceforge.net>
Date: Sat, 23 Oct 2021 11:17:25 -0700
Subject: [PATCH] crt: duplicate query.def in ntquery.def

The attempt to use ntquery.def.in to #include query.def didn't work
correctly for lib32.  For consistency, duplicate the version in
lib-common too.

Signed-off-by: Jeremy Drake <jeremyd2...@users.sourceforge.net>
---
 mingw-w64-crt/lib-common/ntquery.def    | 17 +++++++++++++++++
 mingw-w64-crt/lib-common/ntquery.def.in |  1 -
 mingw-w64-crt/lib32/ntquery.def         | 17 +++++++++++++++++
 mingw-w64-crt/lib32/ntquery.def.in      |  1 -
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 mingw-w64-crt/lib-common/ntquery.def
 delete mode 100644 mingw-w64-crt/lib-common/ntquery.def.in
 create mode 100644 mingw-w64-crt/lib32/ntquery.def
 delete mode 100644 mingw-w64-crt/lib32/ntquery.def.in

diff --git a/mingw-w64-crt/lib-common/ntquery.def 
b/mingw-w64-crt/lib-common/ntquery.def
new file mode 100644
index 000000000..008ccc90f
--- /dev/null
+++ b/mingw-w64-crt/lib-common/ntquery.def
@@ -0,0 +1,17 @@
+;
+; Definition file of query.dll
+; Automatic generated by gendef
+; written by Kai Tietz 2008
+;
+LIBRARY "query.dll"
+EXPORTS
+LoadBinaryFilter
+LoadTextFilter
+BindIFilterFromStorage
+BindIFilterFromStream
+DllCanUnloadNow
+DllGetClassObject
+DllRegisterServer
+DllUnregisterServer
+LoadIFilter
+LoadIFilterEx
diff --git a/mingw-w64-crt/lib-common/ntquery.def.in 
b/mingw-w64-crt/lib-common/ntquery.def.in
deleted file mode 100644
index d4383c255..000000000
--- a/mingw-w64-crt/lib-common/ntquery.def.in
+++ /dev/null
@@ -1 +0,0 @@
-#include "query.def"
diff --git a/mingw-w64-crt/lib32/ntquery.def b/mingw-w64-crt/lib32/ntquery.def
new file mode 100644
index 000000000..3c9096344
--- /dev/null
+++ b/mingw-w64-crt/lib32/ntquery.def
@@ -0,0 +1,17 @@
+;
+; Definition file of query.dll
+; Automatic generated by gendef
+; written by Kai Tietz 2008
+;
+LIBRARY "query.dll"
+EXPORTS
+LoadBinaryFilter@8
+LoadTextFilter@8
+BindIFilterFromStorage@12
+BindIFilterFromStream@12
+DllCanUnloadNow
+DllGetClassObject@12
+DllRegisterServer
+DllUnregisterServer
+LoadIFilter@12
+LoadIFilterEx@16
diff --git a/mingw-w64-crt/lib32/ntquery.def.in 
b/mingw-w64-crt/lib32/ntquery.def.in
deleted file mode 100644
index d4383c255..000000000
--- a/mingw-w64-crt/lib32/ntquery.def.in
+++ /dev/null
@@ -1 +0,0 @@
-#include "query.def"
-- 
2.33.1.windows.1

_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to