Mercurial > mxe-octave

comparison src/msvc-nettle-1.patch @ 3287:5e2851e5d048

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/msvc-nettle-1.patch: Update to nettle 2.7.
author Michael Goffioul <michael.goffioul@gmail.com>
date Tue, 05 Nov 2013 20:03:44 -0500
parents 9c56d108c141
children
comparison
equal deleted inserted replaced
3286:29e227f8bef6 3287:5e2851e5d048
1 diff -ur nettle-2.5-orig/Makefile.in nettle-2.5/Makefile.in 1 diff -ur nettle-2.7-orig/Makefile.in nettle-2.7/Makefile.in
2 --- nettle-2.5-orig/Makefile.in 2012-07-07 09:27:54 -0400 2 --- nettle-2.7-orig/Makefile.in 2013-11-05 14:51:27 -0500
3 +++ nettle-2.5/Makefile.in 2013-06-22 13:11:19 -0400 3 +++ nettle-2.7/Makefile.in 2013-11-05 18:04:21 -0500
4 @@ -161,6 +161,9 @@ 4 @@ -16,7 +16,7 @@
5 hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) 5
6 OPT_ASM_SOURCES = @OPT_ASM_SOURCES@
7
8 -SUBDIRS = tools testsuite examples
9 +SUBDIRS = tools #testsuite examples
10
11 include config.make
12
13 @@ -197,6 +197,9 @@
14 hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) $(OPT_ASM_SOURCES:.asm=.$(OBJEXT))
6 hogweed_PURE_OBJS = $(hogweed_OBJS:.$(OBJEXT)=.p$(OBJEXT)) 15 hogweed_PURE_OBJS = $(hogweed_OBJS:.$(OBJEXT)=.p$(OBJEXT))
7 16
8 +$(nettle_OBJS): PRE_CPPFLAGS += -DBUILDING_NETTLE 17 +$(nettle_OBJS): PRE_CPPFLAGS += -DBUILDING_NETTLE
9 +$(hogweed_OBJS): PRE_CPPFLAGS += -DBUILDING_HOGWEED 18 +$(hogweed_OBJS): PRE_CPPFLAGS += -DBUILDING_HOGWEED
10 + 19 +
11 libnettle.a: $(nettle_OBJS) 20 libnettle.a: $(nettle_OBJS)
12 -rm -f $@ 21 -rm -f $@
13 $(AR) $(ARFLAGS) $@ $(nettle_OBJS) 22 $(AR) $(ARFLAGS) $@ $(nettle_OBJS)
14 @@ -211,7 +214,7 @@ 23 @@ -252,7 +255,7 @@
15 $(LINK) twofishdata.$(OBJEXT) $(LIBS) -o twofishdata$(EXEEXT) 24 -o twofishdata$(EXEEXT_FOR_BUILD)
16 25
17 shadata$(EXEEXT): shadata.$(OBJEXT) 26 shadata$(EXEEXT_FOR_BUILD): shadata.c
18 - $(LINK) shadata.$(OBJEXT) $(LIBS) -lm -o shadata$(EXEEXT) 27 - $(CC_FOR_BUILD) `test -f shadata.c || echo '$(srcdir)/'`shadata.c -lm \
19 + $(LINK) shadata.$(OBJEXT) $(LIBS) -o shadata$(EXEEXT) 28 + $(CC_FOR_BUILD) `test -f shadata.c || echo '$(srcdir)/'`shadata.c \
20 29 -o shadata$(EXEEXT_FOR_BUILD)
21 gcmdata$(EXEEXT): gcmdata.$(OBJEXT) 30
22 $(LINK) gcmdata.$(OBJEXT) $(LIBS) -o gcmdata$(EXEEXT) 31 gcmdata$(EXEEXT_FOR_BUILD): gcmdata.c
23 @@ -236,13 +239,13 @@ 32 @@ -340,10 +343,10 @@
24 .asm.$(OBJEXT): 33 && test -s $@T && mv -f $@T $@
25 $(M4) $(srcdir)/asm.m4 machine.m4 config.m4 \ 34
26 $< >$*.s 35 .s.$(OBJEXT):
27 - $(COMPILE) $(CCPIC_MAYBE) -c $*.s 36 - $(COMPILE) $(CCPIC_MAYBE) -c $<
28 + $(COMPILE_AS) $(CCPIC_MAYBE) -c $*.s 37 + $(COMPILE_AS) $(CCPIC_MAYBE) -c $<
29 echo "$@ : $< $(srcdir)/asm.m4 machine.m4 config.m4" >$@.d 38
30 39 .s.p$(OBJEXT):
31 .asm.p$(OBJEXT): 40 - $(COMPILE) $(SHLIBCFLAGS) -c $< -o $@
32 $(M4) $(srcdir)/asm.m4 machine.m4 config.m4 \ 41 + $(COMPILE_AS) $(SHLIBCFLAGS) -c $< -o $@
33 $< >$*.s
34 - $(COMPILE) $(SHLIBCFLAGS) -c $*.s -o $@
35 + $(COMPILE_AS) $(SHLIBCFLAGS) -c $*.s -o $@
36 echo "$@ : $< $(srcdir)/asm.m4 machine.m4 config.m4" >$@.d
37 42
38 # Texinfo rules 43 # Texinfo rules
39 diff -ur nettle-2.5-orig/config.make.in nettle-2.5/config.make.in 44 .texinfo.info:
40 --- nettle-2.5-orig/config.make.in 2012-07-07 09:27:54 -0400 45 diff -ur nettle-2.7-orig/config.make.in nettle-2.7/config.make.in
41 +++ nettle-2.5/config.make.in 2013-06-22 13:11:19 -0400 46 --- nettle-2.7-orig/config.make.in 2013-04-24 09:26:53 -0400
47 +++ nettle-2.7/config.make.in 2013-11-05 14:56:57 -0500
42 @@ -1,6 +1,7 @@ 48 @@ -1,6 +1,7 @@
43 # Makefile settings shared between Makefiles. 49 # Makefile settings shared between Makefiles.
44 50
45 CC = @CC@ 51 CC = @CC@
46 +CCAS = @CCAS@ 52 +CCAS = @CCAS@
47 CXX = @CXX@ 53 CXX = @CXX@
48 CFLAGS = @CFLAGS@ 54 CFLAGS = @CFLAGS@
49 CXXFLAGS = @CXXFLAGS@ 55 CXXFLAGS = @CXXFLAGS@
50 @@ -68,6 +69,7 @@ 56 @@ -72,6 +73,7 @@
57 # flags before CPPFLAGS and LDFLAGS.
51 58
52 COMPILE = $(CC) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(CCPIC) $(DEP_FLAGS) 59 COMPILE = $(CC) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(CCPIC) $(DEP_FLAGS)
60 +COMPILE_AS = $(CCAS) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(CCPIC) $(DEP_FLAGS)
53 COMPILE_CXX = $(CXX) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(CCPIC) $(DEP_FLAGS) 61 COMPILE_CXX = $(CXX) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(CCPIC) $(DEP_FLAGS)
54 +COMPILE_AS = $(CCAS) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(CCPIC) $(DEP_FLAGS)
55 LINK = $(CC) $(CFLAGS) $(PRE_LDFLAGS) $(LDFLAGS) 62 LINK = $(CC) $(CFLAGS) $(PRE_LDFLAGS) $(LDFLAGS)
56 LINK_CXX = $(CXX) $(CXXFLAGS) $(PRE_LDFLAGS) $(LDFLAGS) 63 LINK_CXX = $(CXX) $(CXXFLAGS) $(PRE_LDFLAGS) $(LDFLAGS)
57 64 diff -ur nettle-2.7-orig/configure nettle-2.7/configure
58 diff -ur nettle-2.5-orig/configure nettle-2.5/configure 65 --- nettle-2.7-orig/configure 2013-04-24 09:26:53 -0400
59 --- nettle-2.5-orig/configure 2012-07-07 09:27:54 -0400 66 +++ nettle-2.7/configure 2013-11-05 14:59:15 -0500
60 +++ nettle-2.5/configure 2013-06-22 13:11:19 -0400 67 @@ -693,6 +693,7 @@
61 @@ -656,6 +656,7 @@
62 LDFLAGS 68 LDFLAGS
63 CFLAGS 69 CFLAGS
64 CC 70 CC
65 +CCAS 71 +CCAS
66 host_os 72 host_os
67 host_vendor 73 host_vendor
68 host_cpu 74 host_cpu
69 @@ -4718,7 +4719,7 @@ 75 @@ -4764,7 +4765,7 @@
70 .size foo, .Lend - foo 76 vmlal.u32 q1, d0, d1
71 77
72 EOF 78 EOF
73 -gmp_assemble="$CC $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1" 79 -gmp_assemble="$CC $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1"
74 +gmp_assemble="$CCAS $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1" 80 +gmp_assemble="$CCAS $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1"
75 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 81 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5
76 (eval $gmp_assemble) 2>&5 82 (eval $gmp_assemble) 2>&5
77 ac_status=$? 83 ac_status=$?
78 @@ -4754,7 +4755,7 @@ 84 @@ -5106,7 +5107,7 @@
79 .size foo, .Lend - foo 85 .size foo, .Lend - foo
80 86
81 EOF 87 EOF
82 -gmp_assemble="$CC $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1" 88 -gmp_assemble="$CC $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1"
83 +gmp_assemble="$CCAS $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1" 89 +gmp_assemble="$CCAS $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1"
84 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 90 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5
85 (eval $gmp_assemble) 2>&5 91 (eval $gmp_assemble) 2>&5
86 ac_status=$? 92 ac_status=$?
87 @@ -4793,7 +4794,7 @@ 93 @@ -5142,7 +5143,7 @@
88 .align 3 94 .size foo, .Lend - foo
89 95
90 EOF 96 EOF
91 -gmp_assemble="$CC $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1" 97 -gmp_assemble="$CC $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1"
92 +gmp_assemble="$CCAS $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1" 98 +gmp_assemble="$CCAS $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1"
93 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 99 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5
94 (eval $gmp_assemble) 2>&5 100 (eval $gmp_assemble) 2>&5
95 ac_status=$? 101 ac_status=$?
96 diff -ur nettle-2.5-orig/examples/base16enc.c nettle-2.5/examples/base16enc.c 102 @@ -5217,7 +5218,7 @@
97 --- nettle-2.5-orig/examples/base16enc.c 2012-07-07 09:27:55 -0400 103 .align 3
98 +++ nettle-2.5/examples/base16enc.c 2013-06-22 13:11:50 -0400 104
99 @@ -47,16 +47,18 @@ 105 EOF
100 int 106 -gmp_assemble="$CC $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1"
101 main(int argc UNUSED, char **argv UNUSED) 107 +gmp_assemble="$CCAS $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1"
102 { 108 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5
103 + uint8_t * buffer; 109 (eval $gmp_assemble) 2>&5
104 + uint8_t * result; 110 ac_status=$?
105 111 diff -ur nettle-2.7-orig/ecc-curve.h nettle-2.7/ecc-curve.h
106 /* "buffer" will hold the bytes from disk: */ 112 --- nettle-2.7-orig/ecc-curve.h 2013-04-24 09:26:52 -0400
107 - uint8_t * buffer = (uint8_t *) malloc (CHUNK_SIZE * sizeof(uint8_t)); 113 +++ nettle-2.7/ecc-curve.h 2013-11-05 15:27:46 -0500
108 + buffer = (uint8_t *) malloc (CHUNK_SIZE * sizeof(uint8_t)); 114 @@ -25,6 +25,18 @@
109 if (buffer == NULL) { 115 #ifndef NETTLE_ECC_CURVE_H_INCLUDED
110 fprintf (stderr, "Cannot allocate read buffer.\n"); 116 #define NETTLE_ECC_CURVE_H_INCLUDED
111 return EXIT_FAILURE; 117
112 } 118 +#ifndef HOGWEED_EXPORTED
113 119 +# ifdef _MSC_VER
114 /* "result" will hold bytes before output: */ 120 +# ifdef BUILDING_HOGWEED
115 - uint8_t * result = (uint8_t *) malloc (ENCODED_SIZE * sizeof(uint8_t)); 121 +# define HOGWEED_EXPORTED __declspec(dllexport)
116 + result = (uint8_t *) malloc (ENCODED_SIZE * sizeof(uint8_t)); 122 +# else
117 if (result == NULL) { 123 +# define HOGWEED_EXPORTED __declspec(dllimport)
118 fprintf (stderr, "Cannot allocate write buffer.\n"); 124 +# endif
119 return EXIT_FAILURE;
120 diff -ur nettle-2.5-orig/nettle-meta.h nettle-2.5/nettle-meta.h
121 --- nettle-2.5-orig/nettle-meta.h 2012-07-07 09:27:54 -0400
122 +++ nettle-2.5/nettle-meta.h 2013-06-22 13:11:19 -0400
123 @@ -28,6 +28,16 @@
124
125 #include "nettle-types.h"
126
127 +#ifdef _MSC_VER
128 +# ifdef BUILDING_NETTLE
129 +# define NETTLE_EXPORTED __declspec(dllexport)
130 +# else 125 +# else
131 +# define NETTLE_EXPORTED __declspec(dllimport) 126 +# define HOGWEED_EXPORTED
132 +# endif 127 +# endif
133 +#else
134 +# define NETTLE_EXPORTED
135 +#endif 128 +#endif
136 + 129 +
137 #ifdef __cplusplus 130 #ifdef __cplusplus
138 extern "C" { 131 extern "C" {
139 #endif 132 #endif
140 @@ -97,32 +107,32 @@ 133 @@ -32,11 +44,11 @@
134 /* The contets of this struct is internal. */
135 struct ecc_curve;
136
137 -extern const struct ecc_curve nettle_secp_192r1;
138 -extern const struct ecc_curve nettle_secp_224r1;
139 -extern const struct ecc_curve nettle_secp_256r1;
140 -extern const struct ecc_curve nettle_secp_384r1;
141 -extern const struct ecc_curve nettle_secp_521r1;
142 +extern HOGWEED_EXPORTED const struct ecc_curve nettle_secp_192r1;
143 +extern HOGWEED_EXPORTED const struct ecc_curve nettle_secp_224r1;
144 +extern HOGWEED_EXPORTED const struct ecc_curve nettle_secp_256r1;
145 +extern HOGWEED_EXPORTED const struct ecc_curve nettle_secp_384r1;
146 +extern HOGWEED_EXPORTED const struct ecc_curve nettle_secp_521r1;
147
148 #ifdef __cplusplus
149 }
150 diff -ur nettle-2.7-orig/examples/Makefile.in nettle-2.7/examples/Makefile.in
151 --- nettle-2.7-orig/examples/Makefile.in 2013-11-05 14:51:27 -0500
152 +++ nettle-2.7/examples/Makefile.in 2013-11-05 15:19:45 -0500
153 @@ -11,7 +11,7 @@
154 PRE_LDFLAGS = -L..
155
156 OPENSSL_LIBFLAGS = @OPENSSL_LIBFLAGS@
157 -BENCH_LIBS = @BENCH_LIBS@ -lm
158 +BENCH_LIBS = @BENCH_LIBS@
159
160 HOGWEED_TARGETS = rsa-keygen$(EXEEXT) rsa-sign$(EXEEXT) \
161 rsa-verify$(EXEEXT) rsa-encrypt$(EXEEXT) rsa-decrypt$(EXEEXT) \
162 diff -ur nettle-2.7-orig/nettle-meta.h nettle-2.7/nettle-meta.h
163 --- nettle-2.7-orig/nettle-meta.h 2013-04-24 09:26:52 -0400
164 +++ nettle-2.7/nettle-meta.h 2013-11-05 15:23:56 -0500
165 @@ -28,6 +28,18 @@
166
167 #include "nettle-types.h"
168
169 +#ifndef NETTLE_EXPORTED
170 +# ifdef _MSC_VER
171 +# ifdef BUILDING_NETTLE
172 +# define NETTLE_EXPORTED __declspec(dllexport)
173 +# else
174 +# define NETTLE_EXPORTED __declspec(dllimport)
175 +# endif
176 +# else
177 +# define NETTLE_EXPORTED
178 +# endif
179 +#endif
180 +
181 #ifdef __cplusplus
182 extern "C" {
183 #endif
184 @@ -97,32 +109,32 @@
141 } 185 }
142 186
143 /* null-terminated list of ciphers implemented by this version of nettle */ 187 /* null-terminated list of ciphers implemented by this version of nettle */
144 -extern const struct nettle_cipher * const nettle_ciphers[]; 188 -extern const struct nettle_cipher * const nettle_ciphers[];
145 +extern NETTLE_EXPORTED const struct nettle_cipher * const nettle_ciphers[]; 189 +extern NETTLE_EXPORTED const struct nettle_cipher * const nettle_ciphers[];
187 +extern NETTLE_EXPORTED const struct nettle_cipher nettle_arctwo128; 231 +extern NETTLE_EXPORTED const struct nettle_cipher nettle_arctwo128;
188 +extern NETTLE_EXPORTED const struct nettle_cipher nettle_arctwo_gutmann128; 232 +extern NETTLE_EXPORTED const struct nettle_cipher nettle_arctwo_gutmann128;
189 233
190 struct nettle_hash 234 struct nettle_hash
191 { 235 {
192 @@ -153,17 +163,17 @@ 236 @@ -153,22 +165,22 @@
193 } 237 }
194 238
195 /* null-terminated list of digests implemented by this version of nettle */ 239 /* null-terminated list of digests implemented by this version of nettle */
196 -extern const struct nettle_hash * const nettle_hashes[]; 240 -extern const struct nettle_hash * const nettle_hashes[];
197 +extern NETTLE_EXPORTED const struct nettle_hash * const nettle_hashes[]; 241 +extern NETTLE_EXPORTED const struct nettle_hash * const nettle_hashes[];
198 242
199 -extern const struct nettle_hash nettle_md2; 243 -extern const struct nettle_hash nettle_md2;
200 -extern const struct nettle_hash nettle_md4; 244 -extern const struct nettle_hash nettle_md4;
201 -extern const struct nettle_hash nettle_md5; 245 -extern const struct nettle_hash nettle_md5;
246 -extern const struct nettle_hash nettle_gosthash94;
202 -extern const struct nettle_hash nettle_ripemd160; 247 -extern const struct nettle_hash nettle_ripemd160;
203 -extern const struct nettle_hash nettle_sha1; 248 -extern const struct nettle_hash nettle_sha1;
204 -extern const struct nettle_hash nettle_sha224; 249 -extern const struct nettle_hash nettle_sha224;
205 -extern const struct nettle_hash nettle_sha256; 250 -extern const struct nettle_hash nettle_sha256;
206 -extern const struct nettle_hash nettle_sha384; 251 -extern const struct nettle_hash nettle_sha384;
207 -extern const struct nettle_hash nettle_sha512; 252 -extern const struct nettle_hash nettle_sha512;
253 -extern const struct nettle_hash nettle_sha3_224;
254 -extern const struct nettle_hash nettle_sha3_256;
255 -extern const struct nettle_hash nettle_sha3_384;
256 -extern const struct nettle_hash nettle_sha3_512;
208 +extern NETTLE_EXPORTED const struct nettle_hash nettle_md2; 257 +extern NETTLE_EXPORTED const struct nettle_hash nettle_md2;
209 +extern NETTLE_EXPORTED const struct nettle_hash nettle_md4; 258 +extern NETTLE_EXPORTED const struct nettle_hash nettle_md4;
210 +extern NETTLE_EXPORTED const struct nettle_hash nettle_md5; 259 +extern NETTLE_EXPORTED const struct nettle_hash nettle_md5;
260 +extern NETTLE_EXPORTED const struct nettle_hash nettle_gosthash94;
211 +extern NETTLE_EXPORTED const struct nettle_hash nettle_ripemd160; 261 +extern NETTLE_EXPORTED const struct nettle_hash nettle_ripemd160;
212 +extern NETTLE_EXPORTED const struct nettle_hash nettle_sha1; 262 +extern NETTLE_EXPORTED const struct nettle_hash nettle_sha1;
213 +extern NETTLE_EXPORTED const struct nettle_hash nettle_sha224; 263 +extern NETTLE_EXPORTED const struct nettle_hash nettle_sha224;
214 +extern NETTLE_EXPORTED const struct nettle_hash nettle_sha256; 264 +extern NETTLE_EXPORTED const struct nettle_hash nettle_sha256;
215 +extern NETTLE_EXPORTED const struct nettle_hash nettle_sha384; 265 +extern NETTLE_EXPORTED const struct nettle_hash nettle_sha384;
216 +extern NETTLE_EXPORTED const struct nettle_hash nettle_sha512; 266 +extern NETTLE_EXPORTED const struct nettle_hash nettle_sha512;
267 +extern NETTLE_EXPORTED const struct nettle_hash nettle_sha3_224;
268 +extern NETTLE_EXPORTED const struct nettle_hash nettle_sha3_256;
269 +extern NETTLE_EXPORTED const struct nettle_hash nettle_sha3_384;
270 +extern NETTLE_EXPORTED const struct nettle_hash nettle_sha3_512;
217 271
218 struct nettle_armor 272 struct nettle_armor
219 { 273 {
220 @@ -215,10 +225,10 @@ 274 @@ -220,10 +232,10 @@
221 } 275 }
222 276
223 /* null-terminated list of armor schemes implemented by this version of nettle */ 277 /* null-terminated list of armor schemes implemented by this version of nettle */
224 -extern const struct nettle_armor * const nettle_armors[]; 278 -extern const struct nettle_armor * const nettle_armors[];
225 +extern NETTLE_EXPORTED const struct nettle_armor * const nettle_armors[]; 279 +extern NETTLE_EXPORTED const struct nettle_armor * const nettle_armors[];
229 +extern NETTLE_EXPORTED const struct nettle_armor nettle_base64; 283 +extern NETTLE_EXPORTED const struct nettle_armor nettle_base64;
230 +extern NETTLE_EXPORTED const struct nettle_armor nettle_base16; 284 +extern NETTLE_EXPORTED const struct nettle_armor nettle_base16;
231 285
232 #ifdef __cplusplus 286 #ifdef __cplusplus
233 } 287 }
234 diff -ur nettle-2.5-orig/tools/sexp-conv.c nettle-2.5/tools/sexp-conv.c 288 diff -ur nettle-2.7-orig/tools/sexp-conv.c nettle-2.7/tools/sexp-conv.c
235 --- nettle-2.5-orig/tools/sexp-conv.c 2012-07-07 09:27:54 -0400 289 --- nettle-2.7-orig/tools/sexp-conv.c 2013-04-24 09:26:53 -0400
236 +++ nettle-2.5/tools/sexp-conv.c 2013-06-22 13:12:00 -0400 290 +++ nettle-2.7/tools/sexp-conv.c 2013-11-05 15:04:03 -0500
237 @@ -225,7 +225,7 @@ 291 @@ -225,7 +225,10 @@
238 292
239 for (;;) 293 for (;;)
240 { 294 {
241 - static const struct nettle_hash *hashes[] = 295 - static const struct nettle_hash *hashes[] =
296 +#ifndef _MSC_VER
297 + static
298 +#endif
242 + const struct nettle_hash *hashes[] = 299 + const struct nettle_hash *hashes[] =
243 { &nettle_md5, &nettle_sha1, &nettle_sha256, NULL }; 300 { &nettle_md5, &nettle_sha1, &nettle_sha256, NULL };
244 301
245 static const struct option options[] = 302 static const struct option options[] =