comparison libpurple/win32/win32dep.h @ 22545:322b92e28005

Add extern "C" wrappers to win32 headers. There is also a change here that I thought I committed earlier that should provide better error messages for winsock errors.
author Daniel Atallah <daniel.atallah@gmail.com>
date Mon, 24 Mar 2008 16:11:21 +0000
parents 723b5a2f91ce
children 1cd99421c696
comparison
equal deleted inserted replaced
22544:217fffe3f46f 22545:322b92e28005
26 #include <winsock2.h> 26 #include <winsock2.h>
27 #include <process.h> 27 #include <process.h>
28 #include "wpurpleerror.h" 28 #include "wpurpleerror.h"
29 #include "libc_interface.h" 29 #include "libc_interface.h"
30 30
31 #ifdef __cplusplus
32 extern "C" {
33 #endif /* __cplusplus */
34
31 /* rpcndr.h defines small as char, causing problems, so we need to undefine it */ 35 /* rpcndr.h defines small as char, causing problems, so we need to undefine it */
32 #ifdef _WIN32
33 #undef small 36 #undef small
34 #endif
35 37
36 /* 38 /*
37 * PROTOS 39 * PROTOS
38 */ 40 */
39 41
48 GIOChannel *wpurple_g_io_channel_win32_new_socket(int socket); /* Until we get the post-2.8 glib win32 giochannel implementation working, use the thread-based one */ 50 GIOChannel *wpurple_g_io_channel_win32_new_socket(int socket); /* Until we get the post-2.8 glib win32 giochannel implementation working, use the thread-based one */
49 /** Check for changes to the system proxy settings and update the HTTP_PROXY env. var. if there have been changes */ 51 /** Check for changes to the system proxy settings and update the HTTP_PROXY env. var. if there have been changes */
50 gboolean wpurple_check_for_proxy_changes(void); 52 gboolean wpurple_check_for_proxy_changes(void);
51 53
52 /* Determine Purple paths */ 54 /* Determine Purple paths */
53 char *wpurple_get_special_folder(int folder_type); /* needs to be g_free'd */ 55 gchar *wpurple_get_special_folder(int folder_type); /* needs to be g_free'd */
54 const char *wpurple_install_dir(void); 56 const char *wpurple_install_dir(void);
55 const char *wpurple_lib_dir(void); 57 const char *wpurple_lib_dir(void);
56 const char *wpurple_locale_dir(void); 58 const char *wpurple_locale_dir(void);
57 const char *wpurple_data_dir(void); 59 const char *wpurple_data_dir(void);
58 60
71 */ 73 */
72 #define DATADIR wpurple_install_dir() 74 #define DATADIR wpurple_install_dir()
73 #define LIBDIR wpurple_lib_dir() 75 #define LIBDIR wpurple_lib_dir()
74 #define LOCALEDIR wpurple_locale_dir() 76 #define LOCALEDIR wpurple_locale_dir()
75 77
78 #ifdef __cplusplus
79 }
80 #endif /* __cplusplus */
81
76 #endif /* _WIN32DEP_H_ */ 82 #endif /* _WIN32DEP_H_ */
77 83