diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-04-14 13:56:07 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-04-14 13:56:07 +0000 |
| commit | 70c4cd102f437a1379a66b036cd0f26837d003ea (patch) | |
| tree | f700115eb2cd5a895d8be710b5ed16a80185c601 /src | |
| parent | 217f77c9ef015684b08f77b2d129155c76414f9e (diff) | |
Fix compiler warnings.
Use fl_yes and fl_no for the Forms emulation, instead of the hardcoded
strings.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4283 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Gl_Window.cxx | 4 | ||||
| -rw-r--r-- | src/Fl_win32.cxx | 6 | ||||
| -rw-r--r-- | src/scandir_win32.c | 8 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx index ac2ed93a3..e9f7de202 100644 --- a/src/Fl_Gl_Window.cxx +++ b/src/Fl_Gl_Window.cxx @@ -95,8 +95,10 @@ int Fl_Gl_Window::mode(int m, const int *a) { if (m == mode_ && a == alist) return 0; #ifndef __APPLE__ int oldmode = mode_; +#endif // !__APPLE__ +#if !defined(WIN32) && !defined(__APPLE__) Fl_Gl_Choice* oldg = g; -#endif +#endif // !WIN32 && !__APPLE__ context(0); mode_ = m; alist = a; if (shown()) { diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index c3764c7ca..d9886d2cf 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -158,9 +158,9 @@ void Fl::add_fd(int n, int events, void (*cb)(int, void*), void *v) { if (events & POLLERR) mask |= FD_CLOSE; WSAAsyncSelect(n, fl_window, WM_FLSELECT, mask); #else - if (events & POLLIN) FD_SET(n, &fdsets[0]); - if (events & POLLOUT) FD_SET(n, &fdsets[1]); - if (events & POLLERR) FD_SET(n, &fdsets[2]); + if (events & POLLIN) FD_SET((unsigned)n, &fdsets[0]); + if (events & POLLOUT) FD_SET((unsigned)n, &fdsets[1]); + if (events & POLLERR) FD_SET((unsigned)n, &fdsets[2]); if (n > maxfd) maxfd = n; #endif // USE_ASYNC_SELECT } diff --git a/src/scandir_win32.c b/src/scandir_win32.c index 1bf9fe7dc..e5b11ba6e 100644 --- a/src/scandir_win32.c +++ b/src/scandir_win32.c @@ -43,7 +43,7 @@ int fl_scandir(const char *dirname, struct dirent ***namelist, unsigned long ret; len = strlen(dirname); - findIn = (char *)malloc(len+5); + findIn = (char *)malloc((size_t)(len+5)); if (!findIn) return -1; @@ -72,7 +72,7 @@ int fl_scandir(const char *dirname, struct dirent ***namelist, } if (!select || (*select)(selectDir)) { if (nDir==NDir) { - struct dirent **tempDir = (struct dirent **)calloc(sizeof(struct dirent*), NDir+33); + struct dirent **tempDir = (struct dirent **)calloc(sizeof(struct dirent*), (size_t)(NDir+33)); if (NDir) memcpy(tempDir, dir, sizeof(struct dirent*)*NDir); if (dir) free(dir); dir = tempDir; @@ -94,8 +94,8 @@ int fl_scandir(const char *dirname, struct dirent ***namelist, free (findIn); - if (compar) qsort (dir, nDir, sizeof(*dir), - (int(*)(const void*, const void*))compar); + if (compar) qsort(dir, (size_t)nDir, sizeof(*dir), + (int(*)(const void*, const void*))compar); *namelist = dir; return nDir; |