Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-04 15:32:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

+ Added a new optional compile time varaible named USE_WSOCK1 that would change the use of the WINSOCK2 libray by default, by the use of Winsock 1 (also implies the use of winsock.h instead of winsock2.h)

Browse Source 
+ Removed one unused ret variable.

TODO: remove unnecessary wsock32.lib dependency from fltk-config, and other win32 build files.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6172 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Fabien Costantini
2008-08-27 16:53:39 +00:00
parent 18b431e02c
commit bc6d15183c
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+1
View File
@@ -14,6 +14,7 @@ CHANGES IN FLTK 1.3.0
Fl_Value_Input, and Fl_Text_Display derived Fl_Value_Input, and Fl_Text_Display derived
widgets (STR #1770) widgets (STR #1770)
- Initial setup (STR #1904) - Initial setup (STR #1904)
- winsock dll is dynamically loaded and by default ws2_32.dll, use of winsock1 is still possible by defining USE_WSOCK1 at compile time.
CHANGES IN FLTK 1.1.9 CHANGES IN FLTK 1.1.9
src/Fl_win32.cxx
+10 -6
View File
@@ -44,7 +44,13 @@
# include <sys/time.h> # include <sys/time.h>
# include <unistd.h> # include <unistd.h>
#else #else
# if !defined(USE_WSOCK1)
# define WSCK_DLL_NAME "WS2_32.DLL"
# include <winsock2.h>
#else
# define WSCK_DLL_NAME "WSOCK32.DLL"
# include <winsock.h> # include <winsock.h>
# endif
#endif #endif
#include <winuser.h> #include <winuser.h>
#include <commctrl.h> #include <commctrl.h>
@@ -65,11 +71,6 @@
//#define USE_ASYNC_SELECT //#define USE_ASYNC_SELECT
// dynamic wsock dll handling api: // dynamic wsock dll handling api:
#if 1
#define WSCK_DLL_NAME "WS2_32.DLL"
#else
#define WSCK_DLL_NAME "WSOCK32.DLL"
#endif
typedef int (WINAPI* fl_wsk_select_f)(int, fd_set*, fd_set*, fd_set*, const struct timeval*); typedef int (WINAPI* fl_wsk_select_f)(int, fd_set*, fd_set*, fd_set*, const struct timeval*);
typedef int (WINAPI* fl_wsk_fd_is_set_f)(SOCKET, fd_set *); typedef int (WINAPI* fl_wsk_fd_is_set_f)(SOCKET, fd_set *);
typedef int (WINAPI* fl_wsk_async_select_f)(SOCKET,HWND,u_int,long); typedef int (WINAPI* fl_wsk_async_select_f)(SOCKET,HWND,u_int,long);
@@ -82,6 +83,10 @@ static fl_wsk_async_select_f fl_wsk_async_select=0;
static HMODULE get_wsock_mod() { static HMODULE get_wsock_mod() {
if (!s_wsock_mod) { if (!s_wsock_mod) {
s_wsock_mod = LoadLibrary(WSCK_DLL_NAME); s_wsock_mod = LoadLibrary(WSCK_DLL_NAME);
if (s_wsock_mod==NULL){
fprintf(stderr,"FLTK Lib Error: %s file not found! Please check your winsock dll accessibility.\n",WSCK_DLL_NAME);
exit(1);
}
s_wsock_select = (fl_wsk_select_f) GetProcAddress(s_wsock_mod, "select"); s_wsock_select = (fl_wsk_select_f) GetProcAddress(s_wsock_mod, "select");
fl_wsk_fd_is_set = (fl_wsk_fd_is_set_f) GetProcAddress(s_wsock_mod, "__WSAFDIsSet"); fl_wsk_fd_is_set = (fl_wsk_fd_is_set_f) GetProcAddress(s_wsock_mod, "__WSAFDIsSet");
fl_wsk_async_select = (fl_wsk_async_select_f) GetProcAddress(s_wsock_mod, "WSAAsyncSelect"); fl_wsk_async_select = (fl_wsk_async_select_f) GetProcAddress(s_wsock_mod, "WSAAsyncSelect");
@@ -273,7 +278,6 @@ int fl_wait(double time_to_wait) {
for (int i = 0; i < nfds; i ++) { for (int i = 0; i < nfds; i ++) {
SOCKET f = fd[i].fd; SOCKET f = fd[i].fd;
short revents = 0; short revents = 0;
int ret=0;
if (fl_wsk_fd_is_set(f, &fdt[0])) revents |= POLLIN; if (fl_wsk_fd_is_set(f, &fdt[0])) revents |= POLLIN;
if (fl_wsk_fd_is_set(f, &fdt[1])) revents |= POLLOUT; if (fl_wsk_fd_is_set(f, &fdt[1])) revents |= POLLOUT;
if (fl_wsk_fd_is_set(f, &fdt[2])) revents |= POLLERR; if (fl_wsk_fd_is_set(f, &fdt[2])) revents |= POLLERR;