Fix bootstrap on MS-Windows

* src/w32uniscribe.c (syms_of_w32uniscribe): Don't call
'syms_of_w32dwrite' here...
* src/emacs.c (main): ...call it here.  Reported by Andy Moreton
<andrewjmoreton@gmail.com>.

(cherry picked from commit 02510606f6d0e431e36634b8290e648b3a47af18)

diff --git a/src/emacs.c b/src/emacs.c
index b0d1f2f53e8d047fe16ce606724fe1e9e43c6b4b..bdd9eee10c48d9e5db0928cad885049343abdafb 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2472,6 +2472,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
 #ifdef HAVE_W32NOTIFY
       syms_of_w32notify ();
 #endif /* HAVE_W32NOTIFY */
+      syms_of_w32dwrite ();
 #endif /* WINDOWSNT */
 
       syms_of_xwidget ();

diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index d6db1e9e7db4636a4a9cbb93834a4ccb11c2582f..66d27b81b9e034e6a1ac5d59f201fea847dd5082 100644 (file)
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -1512,7 +1512,6 @@ static void syms_of_w32uniscribe_for_pdumper (void);
 void
 syms_of_w32uniscribe (void)
 {
-  syms_of_w32dwrite ();
   pdumper_do_now_and_after_load (syms_of_w32uniscribe_for_pdumper);
 }