diff options
| author | Daiki Ueno <ueno@gnu.org> | 2014-07-16 13:11:08 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2014-07-16 13:11:08 +0900 |
| commit | 1c6fefc9557ac174cea6b2d41f0eb3bdb1cced3a (patch) | |
| tree | 6e560c0d010d720080a7f01b9feda503ec93b966 /src/w32gui.h | |
| parent | 7e6d13fea41769d1e66dd1c9cd8b6d61f96da39b (diff) | |
| download | emacs-1c6fefc9557ac174cea6b2d41f0eb3bdb1cced3a.tar.gz | |
Consolidate XChar2b macros for the X, W32, and NS
Suggested by Jan Djärv in:
https://lists.gnu.org/archive/html/emacs-devel/2014-07/msg00203.html
* w32gui.h (XChar2b, STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2):
Move the fallback definitions to dispextern.h.
* nsgui.h (XChar2b, STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2):
Likewise. Share the same definition with W32.
* xterm.h (STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2): Move to ...
* dispextern.h (STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2):
... here for the consistency with W32 and NS.
Diffstat (limited to 'src/w32gui.h')
| -rw-r--r-- | src/w32gui.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/w32gui.h b/src/w32gui.h index d04ce625d1d..8642c479be8 100644 --- a/src/w32gui.h +++ b/src/w32gui.h @@ -52,18 +52,6 @@ typedef HCURSOR Cursor; #define No_Cursor (0) -#define XChar2b wchar_t - -/* Dealing with bits of wchar_t as if they were an XChar2b. */ -#define STORE_XCHAR2B(chp, byte1, byte2) \ - ((*(chp)) = ((XChar2b)((((byte1) & 0x00ff) << 8) | ((byte2) & 0x00ff)))) - -#define XCHAR2B_BYTE1(chp) \ - (((*(chp)) & 0xff00) >> 8) - -#define XCHAR2B_BYTE2(chp) \ - ((*(chp)) & 0x00ff) - /* Windows equivalent of XImage. */ typedef struct _XImage |