diff options
author | agc <agc> | 1998-08-11 07:59:09 +0000 |
---|---|---|
committer | agc <agc> | 1998-08-11 07:59:09 +0000 |
commit | ab1c118b0139588224bec35ec0ed3159d3f92816 (patch) | |
tree | 15975be53d5bf7dd17c4f82993cf23b5e3a52113 /security | |
parent | e54115401df12c86ef13816c6ae233c151ee5f7c (diff) | |
download | pkgsrc-ab1c118b0139588224bec35ec0ed3159d3f92816.tar.gz |
Avoid conflicts with NetBSD BIG_ENDIAN and LITTLE_ENDIAN definitions.
Diffstat (limited to 'security')
-rw-r--r-- | security/py-crypto/patches/patch-ac | 22 | ||||
-rw-r--r-- | security/py-crypto/patches/patch-ad | 24 | ||||
-rw-r--r-- | security/py-crypto/patches/patch-ae | 15 | ||||
-rw-r--r-- | security/py-crypto/patches/patch-af | 15 | ||||
-rw-r--r-- | security/py-crypto/patches/patch-ag | 22 | ||||
-rw-r--r-- | security/py-crypto/patches/patch-ah | 22 | ||||
-rw-r--r-- | security/py-crypto/patches/patch-ai | 22 |
7 files changed, 142 insertions, 0 deletions
diff --git a/security/py-crypto/patches/patch-ac b/security/py-crypto/patches/patch-ac new file mode 100644 index 00000000000..b3595fe64d3 --- /dev/null +++ b/security/py-crypto/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.1 1998/08/11 07:59:09 agc Exp $ + +Avoid conflicts with NetBSD ENDIAN macros + +--- framewks/hash.in 1998/08/11 07:18:58 1.1 ++++ framewks/hash.in 1998/08/11 07:19:54 +@@ -25,11 +25,11 @@ + #include "modsupport.h" + + /* Endianness testing and definitions */ +-#define TestEndianness(variable) {int i=1; variable=BIG_ENDIAN;\ +- if (*((char*)&i)==1) variable=LITTLE_ENDIAN;} ++#define TestEndianness(variable) {int i=1; variable=Py_BIG_ENDIAN;\ ++ if (*((char*)&i)==1) variable=Py_LITTLE_ENDIAN;} + +-#define LITTLE_ENDIAN 1 +-#define BIG_ENDIAN 0 ++#define Py_LITTLE_ENDIAN 1 ++#define Py_BIG_ENDIAN 0 + + /* This is where the actual code for the hash function will go */ + diff --git a/security/py-crypto/patches/patch-ad b/security/py-crypto/patches/patch-ad new file mode 100644 index 00000000000..10cfded57f2 --- /dev/null +++ b/security/py-crypto/patches/patch-ad @@ -0,0 +1,24 @@ +$NetBSD: patch-ad,v 1.1 1998/08/11 07:59:10 agc Exp $ + +Avoid conflicts with NetBSD ENDIAN macros + +--- block/idea.c 1998/08/11 07:24:06 1.1 ++++ block/idea.c 1998/08/11 07:24:54 +@@ -142,7 +142,7 @@ + x2 = *in++; + x3 = *in++; + x4 = *in; +- if (self->Endianness==LITTLE_ENDIAN) ++ if (self->Endianness==Py_LITTLE_ENDIAN) + { + x1 = (x1 >> 8) | (x1 << 8); + x2 = (x2 >> 8) | (x2 << 8); +@@ -177,7 +177,7 @@ + + out = (word16 *) block; + +- if (self->Endianness==BIG_ENDIAN) ++ if (self->Endianness==Py_BIG_ENDIAN) + { + *out++ = x1; + *out++ = x3; diff --git a/security/py-crypto/patches/patch-ae b/security/py-crypto/patches/patch-ae new file mode 100644 index 00000000000..fe2224efccc --- /dev/null +++ b/security/py-crypto/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.1 1998/08/11 07:59:10 agc Exp $ + +Avoid conflicts with NetBSD ENDIAN macros + +--- hash/md5.c 1998/08/11 07:25:42 1.1 ++++ hash/md5.c 1998/08/11 07:26:20 +@@ -49,7 +49,7 @@ + */ + #include <string.h> /* for memcpy() */ + +-#define byteReverse(ptr, field, num) if (ptr->Endianness==BIG_ENDIAN)\ ++#define byteReverse(ptr, field, num) if (ptr->Endianness==Py_BIG_ENDIAN)\ + {uint32 t, longs=num; unsigned char *buf=(unsigned char*)&(ptr->field);\ + do {\ + t = (uint32) ((unsigned) buf[3] << 8 | buf[2]) << 16 |\ diff --git a/security/py-crypto/patches/patch-af b/security/py-crypto/patches/patch-af new file mode 100644 index 00000000000..738420a625c --- /dev/null +++ b/security/py-crypto/patches/patch-af @@ -0,0 +1,15 @@ +$NetBSD: patch-af,v 1.1 1998/08/11 07:59:10 agc Exp $ + +Avoid conflicts with NetBSD ENDIAN macros + +--- hash/sha.c 1998/08/11 07:25:42 1.1 ++++ hash/sha.c 1998/08/11 07:27:10 +@@ -280,7 +280,7 @@ + { + LONG value; + +- if (Endianness==BIG_ENDIAN) return; ++ if (Endianness==Py_BIG_ENDIAN) return; + byteCount /= sizeof( LONG ); + while( byteCount-- ) + { diff --git a/security/py-crypto/patches/patch-ag b/security/py-crypto/patches/patch-ag new file mode 100644 index 00000000000..2a0190314e5 --- /dev/null +++ b/security/py-crypto/patches/patch-ag @@ -0,0 +1,22 @@ +$NetBSD: patch-ag,v 1.1 1998/08/11 07:59:11 agc Exp $ + +Avoid conflicts with NetBSD ENDIAN macros + +--- framewks/block.in 1998/08/11 07:33:22 1.1 ++++ framewks/block.in 1998/08/11 07:34:06 +@@ -40,11 +40,11 @@ + #define MODE_PGP 4 + + /* Endianness testing and definitions */ +-#define TestEndianness(variable) {int i=1; variable=BIG_ENDIAN;\ +- if (*((char*)&i)==1) variable=LITTLE_ENDIAN;} ++#define TestEndianness(variable) {int i=1; variable=Py_BIG_ENDIAN;\ ++ if (*((char*)&i)==1) variable=Py_LITTLE_ENDIAN;} + +-#define LITTLE_ENDIAN 1 +-#define BIG_ENDIAN 0 ++#define Py_LITTLE_ENDIAN 1 ++#define Py_BIG_ENDIAN 0 + + + /* diff --git a/security/py-crypto/patches/patch-ah b/security/py-crypto/patches/patch-ah new file mode 100644 index 00000000000..c2637b8c73d --- /dev/null +++ b/security/py-crypto/patches/patch-ah @@ -0,0 +1,22 @@ +$NetBSD: patch-ah,v 1.1 1998/08/11 07:59:11 agc Exp $ + +Avoid conflicts with NetBSD ENDIAN macros + +--- framewks/stream.in 1998/08/11 07:35:20 1.1 ++++ framewks/stream.in 1998/08/11 07:36:01 +@@ -33,11 +33,11 @@ + + + /* Endianness testing and definitions */ +-#define TestEndianness(variable) {int i=1; variable=BIG_ENDIAN;\ +- if (*((char*)&i)==1) variable=LITTLE_ENDIAN;} ++#define TestEndianness(variable) {int i=1; variable=Py_BIG_ENDIAN;\ ++ if (*((char*)&i)==1) variable=Py_LITTLE_ENDIAN;} + +-#define LITTLE_ENDIAN 1 +-#define BIG_ENDIAN 0 ++#define Py_LITTLE_ENDIAN 1 ++#define Py_BIG_ENDIAN 0 + + + /* diff --git a/security/py-crypto/patches/patch-ai b/security/py-crypto/patches/patch-ai new file mode 100644 index 00000000000..9092c44952e --- /dev/null +++ b/security/py-crypto/patches/patch-ai @@ -0,0 +1,22 @@ +$NetBSD: patch-ai,v 1.1 1998/08/11 07:59:11 agc Exp $ + +Avoid conflicts with NetBSD ENDIAN macros + +--- simple/haval.c 1998/08/11 07:43:00 1.1 ++++ simple/haval.c 1998/08/11 07:43:43 +@@ -31,11 +31,11 @@ + #include "modsupport.h" + + /* Endianness testing and definitions */ +-#define TestEndianness(variable) {int i=1; variable=BIG_ENDIAN;\ +- if (*((char*)&i)==1) variable=LITTLE_ENDIAN;} ++#define TestEndianness(variable) {int i=1; variable=Py_BIG_ENDIAN;\ ++ if (*((char*)&i)==1) variable=Py_LITTLE_ENDIAN;} + +-#define LITTLE_ENDIAN 1 +-#define BIG_ENDIAN 0 ++#define Py_LITTLE_ENDIAN 1 ++#define Py_BIG_ENDIAN 0 + + /* This is where the actual code for the hash function will go */ + |