diff options
| author | Daiki Ueno | 2014-07-16 13:31:31 +0900 |
|---|---|---|
| committer | Daiki Ueno | 2014-07-16 13:31:31 +0900 |
| commit | 7ec2c0effc0ad7ed27ed9b040e75bd953d65fedc (patch) | |
| tree | 0f57231da6e2497a2307843d025fcf8f3d1a67eb /src/nsgui.h | |
| parent | 1c6fefc9557ac174cea6b2d41f0eb3bdb1cced3a (diff) | |
| download | emacs-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/nsgui.h')
| -rw-r--r-- | src/nsgui.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/nsgui.h b/src/nsgui.h index b38b4482b87..3cc011f6646 100644 --- a/src/nsgui.h +++ b/src/nsgui.h | |||
| @@ -58,6 +58,14 @@ typedef struct _XCharStruct | |||
| 58 | int descent; | 58 | int descent; |
| 59 | } XCharStruct; | 59 | } XCharStruct; |
| 60 | 60 | ||
| 61 | /* Fake structure from Xlib.h to represent two-byte characters. */ | ||
| 62 | #ifdef HAVE_NS | ||
| 63 | #ifndef __OBJC__ | ||
| 64 | typedef unsigned short unichar; | ||
| 65 | #endif | ||
| 66 | typedef unichar XChar2b; | ||
| 67 | #endif | ||
| 68 | |||
| 61 | 69 | ||
| 62 | /* XXX: xfaces requires these structures, but the question is are we | 70 | /* XXX: xfaces requires these structures, but the question is are we |
| 63 | forced to use them? */ | 71 | forced to use them? */ |