wok-next view arj/stuff/patches/arches_align.patch @ rev 19715
Fix building: pciutils, pcmanfm-legacy, arj
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sat May 13 17:25:31 2017 +0300 (2017-05-13) |
| parents | |
| children |
line source
1 #DPATCHLEVEL=1
2 diff -Naur arj-3.10.19.orig/arj_proc.c arj-3.10.19/arj_proc.c
3 --- arj-3.10.19.orig/arj_proc.c 2004-02-20 14:18:52.000000000 +0100
4 +++ arj-3.10.22/arj_proc.c 2004-04-08 14:06:58.000000000 +0200
5 @@ -2898,7 +2898,7 @@
6 }
7 #endif
9 -#if defined(WORDS_BIGENDIAN)&&!defined(ARJDISP)&&!defined(REGISTER)
10 +#if (defined(WORDS_BIGENDIAN) || defined(ALIGN_POINTERS)) && !defined(ARJDISP) && !defined(REGISTER)
11 /* Model-independent routine to get 2 bytes from far RAM */
13 unsigned int mget_word(char FAR *p)
14 diff -Naur arj-3.10.19.orig/arj_proc.h arj-3.10.19/arj_proc.h
15 --- arj-3.10.19.orig/arj_proc.h 2004-01-25 01:40:00.000000000 +0100
16 +++ arj-3.10.22/arj_proc.h 2004-04-08 14:07:18.000000000 +0200
17 @@ -12,7 +12,7 @@
19 #define mget_byte(p) (*(unsigned char FAR *)(p)&0xFF)
20 #define mput_byte(c, p) *(unsigned char FAR *)(p)=(unsigned char)(c)
21 -#ifndef WORDS_BIGENDIAN
22 +#if !defined(ALIGN_POINTERS) && !defined(WORDS_BIGENDIAN)
23 #define mget_word(p) (*(unsigned short *)(p)&0xFFFF)
24 #define mput_word(w,p) (*(unsigned short *)(p)=(unsigned short)(w))
25 #define mget_dword(p) (*(unsigned long *)(p))
26 @@ -60,7 +60,7 @@
27 void unpack_mem(struct mempack *mempack);
28 void strip_lf(char *str);
29 char *ltrim(char *str);
30 -#ifdef WORDS_BIGENDIAN
31 +#if defined(ALIGN_POINTERS) || defined(WORDS_BIGENDIAN)
32 unsigned int mget_word(char FAR *p);
33 unsigned long mget_dword(char FAR *p);
34 void mput_word(unsigned int w, char FAR *p);