auto upstream

3 files changed, 17 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ce0455a4981..94eef08b5f8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,14 @@
 2013-03-26  Eli Zaretskii  <eliz@gnu.org>
 
+        * w32.c (_REPARSE_DATA_BUFFER): Condition by _MSVC and _W64.
+
+2013-03-26  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (style_changed_cb): Check if frame is live and an
+        X frame (Bug#14038).
+
+2013-03-26  Eli Zaretskii  <eliz@gnu.org>
+
         * w32.c (_PROCESS_MEMORY_COUNTERS_EX) [_WIN32_WINNT < 0x0500]:
         Define only for _WIN32_WINNT less than 0x0500.
         (_ANONYMOUS_UNION, _ANONYMOUS_STRUCT) [!_W64]: Don't define for
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 2bb4305e1d2..595a7427c21 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1094,7 +1094,9 @@ style_changed_cb (GObject *go,
       FOR_EACH_FRAME (rest, frame)
         {
           FRAME_PTR f = XFRAME (frame);
-          if (FRAME_X_DISPLAY (f) == dpy)
+          if (FRAME_LIVE_P (f)
+              && FRAME_X_P (f)
+              && FRAME_X_DISPLAY (f) == dpy)
             {
               x_set_scroll_bar_default_width (f);
               xg_frame_set_char_size (f, FRAME_COLS (f), FRAME_LINES (f));
diff --git a/src/w32.c b/src/w32.c
index f3c98bf9596..93a4ce1a8c1 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -130,11 +130,11 @@ typedef struct _PROCESS_MEMORY_COUNTERS_EX {
 #define SDDL_REVISION_1 1
 #endif  /* SDDL_REVISION_1 */
 
-#ifndef MAXIMUM_REPARSE_DATA_BUFFER_SIZE
-/* MSVC doesn't provide the definition of REPARSE_DATA_BUFFER and the
-   associated macros, except on ntifs.h, which cannot be included
-   because it triggers conflicts with other Windows API headers.  So
-   we define it here by hand.  */
+#if defined(_MSC_VER) || defined(_W64)
+/* MSVC and MinGW64 don't provide the definition of
+   REPARSE_DATA_BUFFER and the associated macros, except on ntifs.h,
+   which cannot be included because it triggers conflicts with other
+   Windows API headers.  So we define it here by hand.  */
 
 typedef struct _REPARSE_DATA_BUFFER {
     ULONG  ReparseTag;