diff options
| author | Fabien Costantini <fabien@onepost.net> | 2008-10-04 16:35:58 +0000 |
|---|---|---|
| committer | Fabien Costantini <fabien@onepost.net> | 2008-10-04 16:35:58 +0000 |
| commit | fdeb60898e4436b6025214b9e311e157bfd478c0 (patch) | |
| tree | 787b9cbc57ec303de229e6ff76e5b0d73efc2f71 /src | |
| parent | c28c0de681381267b2d616aeb339d206cffeae31 (diff) | |
#STR2056 partial fixes : wsock API now compiles ok, but there are still all utf8 stuff that won't compile: fl_utf8.cxx, fl_set_fonts_win32.cxx won't compile yet and Fl_Preferences recent utf8 addon should be checked for Cygwin.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6375 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Preferences.cxx | 6 | ||||
| -rw-r--r-- | src/Fl_win32.cxx | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/Fl_Preferences.cxx b/src/Fl_Preferences.cxx index 3cd1df5a0..92037dad8 100644 --- a/src/Fl_Preferences.cxx +++ b/src/Fl_Preferences.cxx @@ -655,6 +655,7 @@ Fl_Preferences::RootNode::RootNode( Fl_Preferences *prefs, Root root, const char } +#ifndef __CYGWIN__ if (!filename[1] && !filename[0]) { strcpy(filename, "C:\\FLTK"); } else { @@ -664,7 +665,10 @@ Fl_Preferences::RootNode::RootNode( Fl_Preferences *prefs, Root root, const char filename[len] = 0; free(b); } - +#else +#warning CHECKME (Cygwin) this should probably be UTF8 aware as well + if (!filename[0]) strcpy(filename, "C:\\FLTK"); +#endif snprintf(filename + strlen(filename), sizeof(filename) - strlen(filename), "/%s/%s.prefs", vendor, application); for (char *s = filename; *s; s++) if (*s == '\\') *s = '/'; diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index e3cf9e83b..400dfce48 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -48,13 +48,16 @@ # include <unistd.h> #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> # endif #endif +#if !defined(USE_WSOCK1) +# define WSCK_DLL_NAME "WS2_32.DLL" +#else +# define WSCK_DLL_NAME "WSOCK32.DLL" +#endif #include <winuser.h> #include <commctrl.h> @@ -87,10 +90,12 @@ */ // dynamic wsock dll handling api: +#if defined(__CYGWIN__) && !defined(SOCKET) +# define SOCKET int +#endif 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_async_select_f)(SOCKET,HWND,u_int,long); -//typedef int (WINAPI* fl_wsk_startup_f)(WORD,LPWSADATA); static HMODULE s_wsock_mod = 0; static fl_wsk_select_f s_wsock_select=0; static fl_wsk_fd_is_set_f fl_wsk_fd_is_set=0; |