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

Fixed some compiler errors on WIN32 (STR #647)

Browse Source 
src/scandir_win32.c:
    - Add casts for malloc and calloc calls.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4017 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
2005-02-05 19:22:03 +00:00
parent 9527fee96d
commit 0deaeaa80c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+1
View File
@@ -1,5 +1,6 @@
CHANGES IN FLTK 1.1.7
- Fixed some compiler errors on WIN32 (STR #647)
- FLUID didn't update the widget panel X/Y/W/H values
when moving the selected window (STR #701)
- FLUID didn't use the label type constant names for
src/scandir_win32.c
+4 -4
View File
@@ -1,5 +1,5 @@
/*
* "$Id: scandir_win32.c,v 1.11.2.4.2.9 2004/04/11 04:39:00 easysw Exp $"
* "$Id$"
*
* WIN32 scandir function for the Fast Light Tool Kit (FLTK).
*
@@ -43,7 +43,7 @@ int fl_scandir(const char *dirname, struct dirent ***namelist,
unsigned long ret;
len = strlen(dirname);
findIn = malloc(len+5);
findIn = (char *)malloc(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 = calloc(sizeof(struct dirent*), NDir+33);
struct dirent **tempDir = (struct dirent **)calloc(sizeof(struct dirent*), NDir+33);
if (NDir) memcpy(tempDir, dir, sizeof(struct dirent*)*NDir);
if (dir) free(dir);
dir = tempDir;
@@ -104,5 +104,5 @@ int fl_scandir(const char *dirname, struct dirent ***namelist,
#endif
/*
* End of "$Id: scandir_win32.c,v 1.11.2.4.2.9 2004/04/11 04:39:00 easysw Exp $".
* End of "$Id$".
*/