Mercurial > mxe-octave

annotate src/msvc-dbus-1.patch @ 3108:acee522701c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[MSVC] enable dbus compilation
author Michael Goffioul <michael.goffioul@gmail.com>
date Fri, 28 Jun 2013 21:14:15 -0400
parents
children 42a34b8928a6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3108
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
1 diff -ur dbus-1.6.8-orig/dbus/Makefile.in dbus-1.6.8/dbus/Makefile.in
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
2 --- dbus-1.6.8-orig/dbus/Makefile.in 2012-09-28 15:45:15 -0400
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
3 +++ dbus-1.6.8/dbus/Makefile.in 2013-06-28 20:27:45 -0400
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
4 @@ -614,7 +614,7 @@
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
5 @DBUS_WIN_FALSE@no_undefined =
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
6 @DBUS_WIN_TRUE@no_undefined = -no-undefined
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
7 @DBUS_WIN_FALSE@export_symbols = -export-symbols-regex "^[^_].*"
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
8 -@DBUS_WIN_TRUE@export_symbols =
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
9 +@DBUS_WIN_TRUE@export_symbols = -export-symbols-regex "xXx"
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
10 @DBUS_WIN_TRUE@libdbus_1_la_DEPENDENCIES = $(dbus_res)
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
11 @DBUS_WIN_FALSE@intllibs = @LTLIBINTL@
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
12 @DBUS_WIN_TRUE@intllibs =
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
13 diff -ur dbus-1.6.8-orig/dbus/dbus-sysdeps-util-win.c dbus-1.6.8/dbus/dbus-sysdeps-util-win.c
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
14 --- dbus-1.6.8-orig/dbus/dbus-sysdeps-util-win.c 2012-09-28 15:17:25 -0400
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
15 +++ dbus-1.6.8/dbus/dbus-sysdeps-util-win.c 2013-06-28 20:38:39 -0400
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
16 @@ -105,7 +105,7 @@
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
17 return FALSE;
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
18 }
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
19
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
20 - if (snprintf (pidstr, sizeof (pidstr), "%lu\n", pid) < 0)
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
21 + if (_snprintf (pidstr, sizeof (pidstr), "%lu\n", pid) < 0)
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
22 {
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
23 dbus_set_error (error, _dbus_error_from_system_errno (),
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
24 "Failed to format PID for \"%s\": %s", cfilename,
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
25 diff -ur dbus-1.6.8-orig/dbus/dbus-sysdeps-win.c dbus-1.6.8/dbus/dbus-sysdeps-win.c
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
26 --- dbus-1.6.8-orig/dbus/dbus-sysdeps-win.c 2013-06-28 20:29:08 -0400
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
27 +++ dbus-1.6.8/dbus/dbus-sysdeps-win.c 2013-06-28 20:32:42 -0400
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
28 @@ -1517,7 +1517,7 @@
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
29 host ? host : "*", port, _dbus_strerror_from_errno());
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
30 goto failed;
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
31 }
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
32 - snprintf( portbuf, sizeof( portbuf ) - 1, "%d", addr.AddressIn.sin_port );
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
33 + _snprintf( portbuf, sizeof( portbuf ) - 1, "%d", addr.AddressIn.sin_port );
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
34 if (!_dbus_string_append(retport, portbuf))
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
35 {
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
36 dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
37 diff -ur dbus-1.6.8-orig/dbus/dbus-sysdeps.c dbus-1.6.8/dbus/dbus-sysdeps.c
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
38 --- dbus-1.6.8-orig/dbus/dbus-sysdeps.c 2012-09-28 15:31:05 -0400
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
39 +++ dbus-1.6.8/dbus/dbus-sysdeps.c 2013-06-28 20:32:45 -0400
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
40 @@ -59,6 +59,10 @@
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
41 extern char **environ;
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
42 #endif
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
43
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
44 +#ifdef _MSC_VER
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
45 +# define snprintf _snprintf
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
46 +#endif
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
47 +
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
48 /**
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
49 * @defgroup DBusSysdeps Internal system-dependent API
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
50 * @ingroup DBusInternals
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
51 diff -ur dbus-1.6.8-orig/tools/dbus-monitor.c dbus-1.6.8/tools/dbus-monitor.c
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
52 --- dbus-1.6.8-orig/tools/dbus-monitor.c 2012-09-28 15:17:26 -0400
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
53 +++ dbus-1.6.8/tools/dbus-monitor.c 2013-06-28 20:43:14 -0400
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
54 @@ -39,6 +39,10 @@
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
55
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
56 #ifdef DBUS_WIN
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
57
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
58 +#ifdef _MSC_VER
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
59 +#define snprintf _snprintf
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
60 +#endif
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
61 +
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
62 /* gettimeofday is not defined on windows */
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
63 #define DBUS_SECONDS_SINCE_1601 11644473600LL
acee522701c0 [MSVC] enable dbus compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
64 #define DBUS_USEC_IN_SEC 1000000LL