aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorDaiki Ueno2014-07-16 13:31:31 +0900
committerDaiki Ueno2014-07-16 13:31:31 +0900
commit7ec2c0effc0ad7ed27ed9b040e75bd953d65fedc (patch)
tree0f57231da6e2497a2307843d025fcf8f3d1a67eb /src/ChangeLog
parent1c6fefc9557ac174cea6b2d41f0eb3bdb1cced3a (diff)
downloademacs-7ec2c0effc0ad7ed27ed9b040e75bd953d65fedc.tar.gz
emacs-7ec2c0effc0ad7ed27ed9b040e75bd953d65fedc.zip
Move back the XChar2b definition to w32gui.h and nsgui.h
Fix the last change. XChar2b still needs to be defined platform dependently, to match with the argument types of drawing functions.
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 70c76e34c8c..2d81cf2f465 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,10 +3,10 @@
3 Consolidate XChar2b macros for the X, W32, and NS 3 Consolidate XChar2b macros for the X, W32, and NS
4 Suggested by Jan Djärv in: 4 Suggested by Jan Djärv in:
5 https://lists.gnu.org/archive/html/emacs-devel/2014-07/msg00203.html 5 https://lists.gnu.org/archive/html/emacs-devel/2014-07/msg00203.html
6 * w32gui.h (XChar2b, STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2): 6 * w32gui.h (STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2): Move the
7 Move the fallback definitions to dispextern.h. 7 fallback definitions to dispextern.h.
8 * nsgui.h (XChar2b, STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2): 8 * nsgui.h (STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2): Likewise.
9 Likewise. Share the same definition with W32. 9 Share the same definition with W32.
10 * xterm.h (STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2): Move to ... 10 * xterm.h (STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2): Move to ...
11 * dispextern.h (STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2): 11 * dispextern.h (STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2):
12 ... here for the consistency with W32 and NS. 12 ... here for the consistency with W32 and NS.