In adjust_frame_size don't return too early after font size change.

[gnu-emacs] / src / nsgui.h

diff --git a/src/nsgui.h b/src/nsgui.h
index b38b4482b87a5d9c3ce7ba39fb06a06caa4eda35..498eb7f87f5fcf50a7ee675f3e792da12d785110 100644 (file)
--- a/src/nsgui.h
+++ b/src/nsgui.h
@@ -1,5 +1,5 @@
 /* Definitions and headers for communication on the NeXT/Open/GNUstep API.
-   Copyright (C) 1995, 2005, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2005, 2008-2015 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -58,6 +58,21 @@ typedef struct _XCharStruct
   int descent;
 } XCharStruct;
 
+/* Fake structure from Xlib.h to represent two-byte characters.  */
+#ifndef __OBJC__
+typedef unsigned short unichar;
+#endif
+typedef unichar XChar2b;
+
+#define STORE_XCHAR2B(chp, b1, b2) \
+  (*(chp) = ((XChar2b)((((b1) & 0x00ff) << 8) | ((b2) & 0x00ff))))
+
+#define XCHAR2B_BYTE1(chp) \
+  ((*(chp) & 0xff00) >> 8)
+
+#define XCHAR2B_BYTE2(chp) \
+  (*(chp) & 0x00ff)
+
 
 /* XXX: xfaces requires these structures, but the question is are we
         forced to use them? */