diff options
| author | Stephen Leake | 2019-04-11 14:00:02 -0700 |
|---|---|---|
| committer | Stephen Leake | 2019-04-11 14:00:02 -0700 |
| commit | 7ba7def5caf7ec9d9bebffff489f0a658229fbda (patch) | |
| tree | e0cfcb59937ca0528fb81769d7d48a904a91f5dc /src/xsettings.c | |
| parent | 7768581172e11be52b1fcd8224f4594e126bbdb7 (diff) | |
| parent | de238b39e335c6814283faa171b35145f124edf2 (diff) | |
| download | emacs-7ba7def5caf7ec9d9bebffff489f0a658229fbda.tar.gz emacs-7ba7def5caf7ec9d9bebffff489f0a658229fbda.zip | |
Merge commit 'de238b39e335c6814283faa171b35145f124edf2'
Diffstat (limited to 'src/xsettings.c')
| -rw-r--r-- | src/xsettings.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xsettings.c b/src/xsettings.c index 0c5e36d9d69..947d5cfb7b6 100644 --- a/src/xsettings.c +++ b/src/xsettings.c | |||
| @@ -393,8 +393,8 @@ parse_settings (unsigned char *prop, | |||
| 393 | unsigned long bytes, | 393 | unsigned long bytes, |
| 394 | struct xsettings *settings) | 394 | struct xsettings *settings) |
| 395 | { | 395 | { |
| 396 | Lisp_Object byteorder = Fbyteorder (); | 396 | int int1 = 1; |
| 397 | int my_bo = XFIXNAT (byteorder) == 'B' ? MSBFirst : LSBFirst; | 397 | int my_bo = *(char *) &int1 == 1 ? LSBFirst : MSBFirst; |
| 398 | int that_bo = prop[0]; | 398 | int that_bo = prop[0]; |
| 399 | CARD32 n_settings; | 399 | CARD32 n_settings; |
| 400 | int bytes_parsed = 0; | 400 | int bytes_parsed = 0; |