RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 07-May-2016 16:46:34
Branch: rpm-5_4 Handle: 2016050714463400
Modified files: (Branch: rpm-5_4)
rpm/rpmio blake2.h blake2b.c
Log:
- blake: fix: avoid accidental name collision with ALIGN() on OS X.
Summary:
Revision Changes Path
1.1.2.4 +6 -6 rpm/rpmio/blake2.h
1.1.2.6 +1 -1 rpm/rpmio/blake2b.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/blake2.h
============================================================================
$ cvs diff -u -r1.1.2.3 -r1.1.2.4 blake2.h
--- rpm/rpmio/blake2.h 9 Oct 2014 02:38:24 -0000 1.1.2.3
+++ rpm/rpmio/blake2.h 7 May 2016 14:46:34 -0000 1.1.2.4
@@ -18,9 +18,9 @@
#include <stdint.h>
#if defined(_MSC_VER)
-#define ALIGN(x) __declspec(align(x))
+#define BLAKE_ALIGN(x) __declspec(align(x))
#else
-#define ALIGN(x) __attribute__ ((__aligned__(x)))
+#define BLAKE_ALIGN(x) __attribute__ ((__aligned__(x)))
#endif
#if defined(__cplusplus)
@@ -57,7 +57,7 @@
uint8_t personal[BLAKE2S_PERSONALBYTES]; // 32
} blake2s_param;
- ALIGN(64) typedef struct __blake2s_state {
+ BLAKE_ALIGN(64) typedef struct __blake2s_state {
uint32_t h[8];
uint32_t t[2];
uint32_t f[2];
@@ -81,7 +81,7 @@
uint8_t personal[BLAKE2B_PERSONALBYTES]; // 64
} blake2b_param;
- ALIGN(64) typedef struct __blake2b_state {
+ BLAKE_ALIGN(64) typedef struct __blake2b_state {
uint64_t h[8];
uint64_t t[2];
uint64_t f[2];
@@ -90,14 +90,14 @@
uint8_t last_node;
} blake2b_state;
- ALIGN(64) typedef struct __blake2sp_state {
+ BLAKE_ALIGN(64) typedef struct __blake2sp_state {
blake2s_state S[8][1];
blake2s_state R[1];
uint8_t buf[8 * BLAKE2S_BLOCKBYTES];
size_t buflen;
} blake2sp_state;
- ALIGN(64) typedef struct __blake2bp_state {
+ BLAKE_ALIGN(64) typedef struct __blake2bp_state {
blake2b_state S[4][1];
blake2b_state R[1];
uint8_t buf[4 * BLAKE2B_BLOCKBYTES];
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/blake2b.c
============================================================================
$ cvs diff -u -r1.1.2.5 -r1.1.2.6 blake2b.c
--- rpm/rpmio/blake2b.c 11 May 2015 21:10:18 -0000 1.1.2.5
+++ rpm/rpmio/blake2b.c 7 May 2016 14:46:34 -0000 1.1.2.6
@@ -712,7 +712,7 @@
/*==============================================================*/
#endif /* XXXSSE */
-ALIGN(64)
+BLAKE_ALIGN(64)
static const uint64_t blake2b_IV[8] = {
0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL,
0x3c6ef372fe94f82bULL, 0xa54ff53a5f1d36f1ULL,
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
