View | Details | Raw Unified | Return to bug 261359 | Differences between
and this patch

Collapse All | Expand All

(-)b/x11/cde/files/patch-programs_dtinfo_DtMmdb_btree__berkeley_compat.h (+16 lines)
Added Link Here
1
--- programs/dtinfo/DtMmdb/btree_berkeley/compat.h.orig	2021-12-14 13:35:18 UTC
2
+++ programs/dtinfo/DtMmdb/btree_berkeley/compat.h
3
@@ -147,11 +147,11 @@ void * __fix_realloc __P((void*, size_t));
4
 #define LITTLE_ENDIAN	1234		/* LSB first: i386, vax */
5
 #define BIG_ENDIAN	4321		/* MSB first: 68000, ibm, net */
6
 
7
-#ifdef MMDB_LITTLE_ENDIAN
8
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
9
 #define BYTE_ORDER	LITTLE_ENDIAN	/* Set for your system. */
10
 #endif
11
 
12
-#ifdef MMDB_BIG_ENDIAN
13
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
14
 #define BYTE_ORDER	BIG_ENDIAN	/* Set for your system. */
15
 #endif
16
 
(-)b/x11/cde/files/patch-programs_dtinfo_DtMmdb_schema_store__desc.C (+30 lines)
Added Link Here
1
--- programs/dtinfo/DtMmdb/schema/store_desc.C.orig	2021-12-14 19:59:51 UTC
2
+++ programs/dtinfo/DtMmdb/schema/store_desc.C
3
@@ -66,11 +66,11 @@ store_desc::store_desc(const char* name) : desc(name)
4
    mode_str = strdup("");
5
    order_str = 0;
6
 
7
-#ifdef MMDB_BIG_ENDIAN
8
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
9
    order_str = strdup("big_endian");
10
 #endif
11
 
12
-#ifdef MMDB_LITTLE_ENDIAN
13
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
14
    order_str = strdup("little_endian");
15
 #endif
16
 
17
@@ -87,11 +87,11 @@ store_desc::store_desc(int tp, const char* comment): 
18
 
19
    order_str = 0;
20
 
21
-#ifdef MMDB_BIG_ENDIAN
22
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
23
    order_str = strdup("big_endian");
24
 #endif
25
 
26
-#ifdef MMDB_LITTLE_ENDIAN
27
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
28
    order_str = strdup("little_endian");
29
 #endif
30
 
(-)b/x11/cde/files/patch-programs_dtinfo_DtMmdb_storage_spointer.h (+11 lines)
Added Link Here
1
--- programs/dtinfo/DtMmdb/storage/spointer.h.orig	2021-12-14 10:42:39 UTC
2
+++ programs/dtinfo/DtMmdb/storage/spointer.h
3
@@ -52,7 +52,7 @@
4
 
5
 struct header_t 
6
 {
7
-#ifdef MMDB_BIG_ENDIAN
8
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
9
    unsigned spointer    : 14;
10
    unsigned length      : 14;
11
    unsigned is_object   : 1;
(-)b/x11/cde/files/patch-programs_dtinfo_DtMmdb_utility_atoi__pearson.C (+19 lines)
Added Link Here
1
--- programs/dtinfo/DtMmdb/utility/atoi_pearson.C.orig	2021-12-14 01:08:51 UTC
2
+++ programs/dtinfo/DtMmdb/utility/atoi_pearson.C
3
@@ -107,14 +107,14 @@ atoi_pearson::~atoi_pearson()
4
 }
5
 
6
 struct reg_t {
7
-#ifdef MMDB_BIG_ENDIAN
8
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
9
    unsigned b4: 8;
10
    unsigned b3: 8;
11
    unsigned b2: 8;
12
    unsigned b1: 8;
13
 #endif
14
 
15
-#ifdef MMDB_LITTLE_ENDIAN
16
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
17
    unsigned b1: 8;
18
    unsigned b2: 8;
19
    unsigned b3: 8;
(-)b/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c (+20 lines)
Added Link Here
1
--- programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c.orig	2021-12-13 19:03:46 UTC
2
+++ programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c
3
@@ -49,6 +49,7 @@ hashalloc(Hash_table_t* ref, ...)
4
 	va_list*		vp = va;
5
 	Hash_region_f		region = 0;
6
 	void*			handle;
7
+	va_listarg		tmpval;
8
 
9
 	va_start(ap, ref);
10
 
11
@@ -151,7 +152,8 @@ hashalloc(Hash_table_t* ref, ...)
12
 				va_copy(*vp, ap);
13
 				vp++;
14
 			}
15
-			va_copy(ap, va_listval(va_arg(ap, va_listarg)));
16
+			tmpval = va_listval(va_arg(ap, va_listarg));
17
+			va_copy(ap, tmpval);
18
 			break;
19
 		case 0:
20
 			if (vp > va)
(-)b/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c (+20 lines)
Added Link Here
1
--- programs/dtksh/ksh93/src/lib/libast/string/tokscan.c.orig	2021-12-13 22:46:02 UTC
2
+++ programs/dtksh/ksh93/src/lib/libast/string/tokscan.c
3
@@ -188,6 +188,7 @@ tokscan(register char* s, char** nxt, const char* fmt,
4
 	char**		p_string;
5
 	char*		prv_f = 0;
6
 	va_list		prv_ap;
7
+	va_listarg	tmpval;
8
 
9
 	va_start(ap, fmt);
10
 	if (!*s || *s == '\n')
11
@@ -233,7 +234,8 @@ tokscan(register char* s, char** nxt, const char* fmt,
12
 			prv_f = f;
13
 			f = va_arg(ap, char*);
14
 			va_copy(prv_ap, ap);
15
-			va_copy(ap, va_listval(va_arg(ap, va_listarg)));
16
+			tmpval = va_listval(va_arg(ap, va_listarg));
17
+			va_copy(ap, tmpval);
18
 			continue;
19
 		case 'c':
20
 			p_char = va_arg(ap, char*);

Return to bug 261359