Mercurial > mxe-octave
annotate src/msvc-libgpg_error-1.patch @ 4583:50ce0842665c
* src/graphicsmagick.mk: update version/checksum for v1.3.27
author | John D |
---|---|
date | Tue, 19 Dec 2017 13:13:25 -0500 |
parents | 1f1e0dc9a135 |
children |
rev | line source |
---|---|
3083
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1 diff -ur libgpg-error-1.11-orig/src/Makefile.in libgpg-error-1.11/src/Makefile.in |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
2 --- libgpg-error-1.11-orig/src/Makefile.in 2013-02-25 04:27:23 -0500 |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
3 +++ libgpg-error-1.11/src/Makefile.in 2013-06-23 17:11:24 -0400 |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
4 @@ -999,7 +999,7 @@ |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
5 gpg-error.def: Makefile gpg-error.def.in |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
6 cat $(srcdir)/gpg-error.def.in >_$@.h |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
7 $(CPP) $(DEFAULT_INCLUDES) $(INCLUDES) $(extra_cppflags) _$@.h | \ |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
8 - grep -v '^#' >$@ |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
9 + grep -v '^#' | sed -e '/^$$/d' -e 's/^ *\([^ ]*\).*/\1/' >$@ |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
10 -rm _$@.h |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
11 |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
12 # It is correct to use $(CC_FOR_BUILD) here. We want to run the |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
13 diff -ur libgpg-error-1.11-orig/src/gpg-error.c libgpg-error-1.11/src/gpg-error.c |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
14 --- libgpg-error-1.11-orig/src/gpg-error.c 2010-12-23 11:56:07 -0500 |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
15 +++ libgpg-error-1.11/src/gpg-error.c 2013-06-23 17:11:56 -0400 |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
16 @@ -51,6 +51,11 @@ |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
17 |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
18 #include <gpg-error.h> |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
19 |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
20 +#ifdef _MSC_VER |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
21 +# define strcasecmp stricmp |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
22 +# define strncasecmp strnicmp |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
23 +#endif |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
24 + |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
25 |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
26 #if HAVE_W32_SYSTEM |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
27 /* The implementation follows below. */ |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
28 diff -ur libgpg-error-1.11-orig/src/init.c libgpg-error-1.11/src/init.c |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
29 --- libgpg-error-1.11-orig/src/init.c 2010-12-23 11:56:07 -0500 |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
30 +++ libgpg-error-1.11/src/init.c 2013-06-23 17:11:32 -0400 |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
31 @@ -42,6 +42,10 @@ |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
32 # endif |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
33 #endif |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
34 |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
35 +#ifdef _MSC_VER |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
36 +# define snprintf _snprintf |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
37 +#endif |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
38 + |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
39 |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
40 /* Locale directory support. */ |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
41 |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
42 diff -ur libgpg-error-1.11-orig/src/strerror.c libgpg-error-1.11/src/strerror.c |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
43 --- libgpg-error-1.11-orig/src/strerror.c 2010-12-23 11:56:07 -0500 |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
44 +++ libgpg-error-1.11/src/strerror.c 2013-06-23 17:11:42 -0400 |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
45 @@ -32,6 +32,10 @@ |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
46 #include "gettext.h" |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
47 #include "err-codes.h" |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
48 |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
49 +#ifdef _MSC_VER |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
50 +# define snprintf _snprintf |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
51 +#endif |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
52 + |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
53 /* Return a pointer to a string containing a description of the error |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
54 code in the error value ERR. This function is not thread-safe. */ |
1f1e0dc9a135
[MSVC] enable libgpg_error compilation and update to 1.11
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
55 const char * |