Thu, 26 Oct 2023 22:22:34 -0500
Fix some Windows build header issues
We need to use the helper headers to get the bit flags for `g_mkdir`.
And MSVC doesn't seem to like the empty initializer for the signal array.
Testing Done:
Compiled libpurple on Linux and Windows.
Reviewed at https://reviews.imfreedom.org/r/2731/
|
20147
66f05a854eee
applied changes from 8a731bbd0197fbcc91a705c2d8f528154216defa
Richard Laager <rlaager@pidgin.im>
parents:
19859
diff
changeset
|
1 | /* purple |
| 8273 | 2 | * |
| 15884 | 3 | * Purple is the legal property of its developers, whose names are too numerous |
| 8273 | 4 | * to list here. Please refer to the COPYRIGHT file distributed with this |
| 5 | * source distribution. | |
| 6 | * | |
| 7 | * This program is free software; you can redistribute it and/or modify | |
| 8 | * it under the terms of the GNU General Public License as published by | |
| 9 | * the Free Software Foundation; either version 2 of the License, or | |
| 10 | * (at your option) any later version. | |
| 11 | * | |
| 12 | * This program is distributed in the hope that it will be useful, | |
| 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 | * GNU General Public License for more details. | |
| 16 | * | |
| 17 | * You should have received a copy of the GNU General Public License | |
| 18 | * along with this program; if not, write to the Free Software | |
|
19859
71d37b57eff2
The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
19733
diff
changeset
|
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 8273 | 20 | */ |
|
41685
ca22b00972d4
Stop including internal.h everywhere when we really don't need it.
Gary Kramlich <grim@reaperworld.com>
parents:
39556
diff
changeset
|
21 | |
|
42434
622b4989d073
Fix some Windows build header issues
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
41877
diff
changeset
|
22 | #include "purpleconfig.h" |
|
622b4989d073
Fix some Windows build header issues
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
41877
diff
changeset
|
23 | |
|
622b4989d073
Fix some Windows build header issues
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
41877
diff
changeset
|
24 | #ifdef HAVE_UNISTD_H |
|
41685
ca22b00972d4
Stop including internal.h everywhere when we really don't need it.
Gary Kramlich <grim@reaperworld.com>
parents:
39556
diff
changeset
|
25 | #include <unistd.h> |
|
42434
622b4989d073
Fix some Windows build header issues
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
41877
diff
changeset
|
26 | #endif |
|
41685
ca22b00972d4
Stop including internal.h everywhere when we really don't need it.
Gary Kramlich <grim@reaperworld.com>
parents:
39556
diff
changeset
|
27 | |
| 8273 | 28 | #include "eventloop.h" |
|
41877
11e7400101d2
Fix libpurple compile on Windows
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
41762
diff
changeset
|
29 | #ifdef _WIN32 |
|
11e7400101d2
Fix libpurple compile on Windows
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
41762
diff
changeset
|
30 | #include "win32/win32dep.h" |
|
11e7400101d2
Fix libpurple compile on Windows
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
41762
diff
changeset
|
31 | #endif |
| 8273 | 32 | |
|
38418
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
33 | #define PURPLE_GLIB_READ_COND (G_IO_IN | G_IO_HUP | G_IO_ERR) |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
34 | #define PURPLE_GLIB_WRITE_COND (G_IO_OUT | G_IO_HUP | G_IO_ERR | G_IO_NVAL) |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
35 | |
|
39556
622bf98df0ac
Remove unnecessary struct tags.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
38434
diff
changeset
|
36 | typedef struct { |
|
38418
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
37 | PurpleInputFunction function; |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
38 | guint result; |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
39 | gpointer data; |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
40 | } PurpleIOClosure; |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
41 | |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
42 | static gboolean |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
43 | purple_io_invoke(GIOChannel *source, GIOCondition condition, gpointer data) |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
44 | { |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
45 | PurpleIOClosure *closure = data; |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
46 | PurpleInputCondition purple_cond = 0; |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
47 | |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
48 | if (condition & PURPLE_GLIB_READ_COND) |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
49 | purple_cond |= PURPLE_INPUT_READ; |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
50 | if (condition & PURPLE_GLIB_WRITE_COND) |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
51 | purple_cond |= PURPLE_INPUT_WRITE; |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
52 | |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
53 | #ifdef _WIN32 |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
54 | if(!purple_cond) { |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
55 | return TRUE; |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
56 | } |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
57 | #endif /* _WIN32 */ |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
58 | |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
59 | closure->function(closure->data, g_io_channel_unix_get_fd(source), |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
60 | purple_cond); |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
61 | |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
62 | return TRUE; |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
63 | } |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
64 | |
| 8280 | 65 | guint |
| 15884 | 66 | purple_input_add(int source, PurpleInputCondition condition, PurpleInputFunction func, gpointer user_data) |
| 8273 | 67 | { |
|
38418
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
68 | PurpleIOClosure *closure = g_new0(PurpleIOClosure, 1); |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
69 | GIOChannel *channel; |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
70 | GIOCondition cond = 0; |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
71 | |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
72 | closure->function = func; |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
73 | closure->data = user_data; |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
74 | |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
75 | if (condition & PURPLE_INPUT_READ) |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
76 | cond |= PURPLE_GLIB_READ_COND; |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
77 | if (condition & PURPLE_INPUT_WRITE) |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
78 | cond |= PURPLE_GLIB_WRITE_COND; |
| 8273 | 79 | |
|
38418
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
80 | #ifdef _WIN32 |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
81 | channel = g_io_channel_win32_new_socket(source); |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
82 | #else |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
83 | channel = g_io_channel_unix_new(source); |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
84 | #endif |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
85 | |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
86 | closure->result = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
87 | cond, purple_io_invoke, closure, g_free); |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
88 | |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
89 | g_io_channel_unref(channel); |
|
9d86663a7437
eventloop: Replace eventloop input functions with Pidgin versions
Mike Ruprecht <cmaiku@gmail.com>
parents:
38417
diff
changeset
|
90 | return closure->result; |
| 8273 | 91 | } |
| 92 | ||
|
15746
017e33725857
Added a new GaimEventLoopUiOps item, input_get_error(). This function allows the UI to return the current error status on a socket/input. If the UI does not implement it (as Pidgin and gntgaim do not, since glib's handling of sockets is sane), it is just a wrapper around getsockopt(). Implemented or not, its return values should match those of getsockopt() with a level of SOL_SOCKET and an option of SO_ERROR. For curious souls, Adium will be using this to provide a working version of getsockopt(); the CoreFoundation CFSocket class which is used for socket read/write calls getsockopt() with SO_ERROR itself, thereby clearing the error flag [as documented in getsockopt()'s behavior], so depending upon it for determining if an error occurred leads to significant misbehavior.
Evan Schoenberg <evands@pidgin.im>
parents:
15729
diff
changeset
|
93 | int |
|
33291
b70ab10887a7
New custom resolver, that uses libpurple for DNS queries. Get rid of old win32 resolver. Refs#343. Fixes #6263
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
28981
diff
changeset
|
94 | purple_input_pipe(int pipefd[2]) |
|
b70ab10887a7
New custom resolver, that uses libpurple for DNS queries. Get rid of old win32 resolver. Refs#343. Fixes #6263
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
28981
diff
changeset
|
95 | { |
|
b70ab10887a7
New custom resolver, that uses libpurple for DNS queries. Get rid of old win32 resolver. Refs#343. Fixes #6263
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
28981
diff
changeset
|
96 | #ifdef _WIN32 |
|
b70ab10887a7
New custom resolver, that uses libpurple for DNS queries. Get rid of old win32 resolver. Refs#343. Fixes #6263
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
28981
diff
changeset
|
97 | return wpurple_input_pipe(pipefd); |
|
b70ab10887a7
New custom resolver, that uses libpurple for DNS queries. Get rid of old win32 resolver. Refs#343. Fixes #6263
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
28981
diff
changeset
|
98 | #else |
|
b70ab10887a7
New custom resolver, that uses libpurple for DNS queries. Get rid of old win32 resolver. Refs#343. Fixes #6263
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
28981
diff
changeset
|
99 | return pipe(pipefd); |
|
b70ab10887a7
New custom resolver, that uses libpurple for DNS queries. Get rid of old win32 resolver. Refs#343. Fixes #6263
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
28981
diff
changeset
|
100 | #endif |
|
b70ab10887a7
New custom resolver, that uses libpurple for DNS queries. Get rid of old win32 resolver. Refs#343. Fixes #6263
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
28981
diff
changeset
|
101 | } |