diff options
| author | Greg Ercolano <erco@seriss.com> | 2011-02-01 01:06:27 +0000 |
|---|---|---|
| committer | Greg Ercolano <erco@seriss.com> | 2011-02-01 01:06:27 +0000 |
| commit | 9510d1d52b0bdf3ba8665571eedc42202dc546c7 (patch) | |
| tree | 4da9b6d85a94197ce22143d0fe9a89d4fea692f4 /src/scandir_win32.c | |
| parent | 5759f3151f45a139266b956b7a879fdae08ec4c7 (diff) | |
Fixes to help build on SGI.
Mainly: problem with C++ style comments that were in C code and headers.
SGI C compiler / pre processor no grok C++ comments.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8347 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/scandir_win32.c')
| -rw-r--r-- | src/scandir_win32.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/scandir_win32.c b/src/scandir_win32.c index 2d3b841b9..71e4f7a9a 100644 --- a/src/scandir_win32.c +++ b/src/scandir_win32.c @@ -49,9 +49,9 @@ int fl_scandir(const char *dirname, struct dirent ***namelist, if (!findIn) return -1; strcpy(findIn, dirname); - //#if defined(__GNUC__) - //#warning FIXME This probably needs to be MORE UTF8 aware now - //#endif /*__GNUC__*/ + /* #if defined(__GNUC__) */ + /* #warning FIXME This probably needs to be MORE UTF8 aware now */ + /* #endif */ for (d = findIn; *d; d++) if (*d=='/') *d='\\'; if ((len==0)) { strcpy(findIn, ".\\*"); } if ((len==2)&&findIn[1]==':'&&isalpha(findIn[0])) { *d++ = '\\'; *d = 0; } @@ -64,8 +64,8 @@ int fl_scandir(const char *dirname, struct dirent ***namelist, strcpy(d, "\\*"); } { /* Create a block to limit the scope while we find the initial "wide" filename */ -// unsigned short * wbuf = (unsigned short*)malloc(sizeof(short) *(len + 10)); -// wbuf[fl_utf2unicode(findIn, strlen(findIn), wbuf)] = 0; + /* unsigned short * wbuf = (unsigned short*)malloc(sizeof(short) *(len + 10)); */ + /* wbuf[fl_utf2unicode(findIn, strlen(findIn), wbuf)] = 0; */ unsigned short *wbuf = NULL; unsigned wlen = fl_utf8toUtf16(findIn, strlen(findIn), NULL, 0); /* Pass NULL to query length */ wlen++; /* add a little extra for termination etc. */ @@ -89,7 +89,7 @@ int fl_scandir(const char *dirname, struct dirent ***namelist, int dstlen = l * 5 + 1; selectDir=(struct dirent*)malloc(sizeof(struct dirent)+dstlen); -// l = fl_unicode2utf(findw.cFileName, l, selectDir->d_name); + /* l = fl_unicode2utf(findw.cFileName, l, selectDir->d_name); */ l = fl_utf8fromwc(selectDir->d_name, dstlen, findw.cFileName, l); selectDir->d_name[l] = 0; |