diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | FL/filename.H | 11 | ||||
| -rw-r--r-- | src/scandir_win32.c | 4 | ||||
| -rw-r--r-- | src/vsnprintf.c | 4 |
4 files changed, 11 insertions, 9 deletions
@@ -3,6 +3,7 @@ CHANGES IN FLTK 1.1.7 - Documentation fixes (STR #571, STR #648, STR #692, STR #730, STR #744, STR #745, STR #931, STR #942, STR #960, STR #969) + - Fixed C Plus Plus style comments in C files (STR #997) - Fixed signednes of scanf argument (STR #996) - Fixed cross-compiling (host: *-linux-* , target: *-mingw32) problem. Patch provided by Amir Shalem <amir@boom.org.il> in (STR #995) . diff --git a/FL/filename.H b/FL/filename.H index 48829deb6..558154baf 100644 --- a/FL/filename.H +++ b/FL/filename.H @@ -59,11 +59,12 @@ struct dirent {char d_name[1];}; # elif defined(__APPLE__) && defined(__PROJECTBUILDER__) -// Apple's ProjectBuilder has the nasty habit of including recursively -// down the file tree. To avoid re-including <FL/dirent.h> we must -// directly include the systems math file. (Plus, I could not find a -// predefined macro for ProjectBuilder builds, so we have to define it -// in the project) +/* Apple's ProjectBuilder has the nasty habit of including recursively + * down the file tree. To avoid re-including <FL/dirent.h> we must + * directly include the systems math file. (Plus, I could not find a + * predefined macro for ProjectBuilder builds, so we have to define it + * in the project) + */ # include <sys/types.h> # include "/usr/include/dirent.h" diff --git a/src/scandir_win32.c b/src/scandir_win32.c index 001d4f94b..00d0b8e6a 100644 --- a/src/scandir_win32.c +++ b/src/scandir_win32.c @@ -56,7 +56,7 @@ int fl_scandir(const char *dirname, struct dirent ***namelist, if ((len==1)&& (d[-1]=='.')) { strcpy(findIn, ".\\*"); is_dir = 1; } if ((len>0) && (d[-1]=='\\')) { *d++ = '*'; *d = 0; is_dir = 1; } if ((len>1) && (d[-1]=='.') && (d[-2]=='\\')) { d[-1] = '*'; is_dir = 1; } - if (!is_dir) { // this file may still be a directory that we need to list + if (!is_dir) { /* this file may still be a directory that we need to list */ DWORD attr = GetFileAttributes(findIn); if (attr&FILE_ATTRIBUTE_DIRECTORY) strcpy(d, "\\*"); @@ -74,7 +74,7 @@ int fl_scandir(const char *dirname, struct dirent ***namelist, selectDir=(struct dirent*)malloc(sizeof(struct dirent)+strlen(find.cFileName)+2); strcpy(selectDir->d_name, find.cFileName); if (find.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { - // Append a trailing slash to directory names... + /* Append a trailing slash to directory names... */ strcat(selectDir->d_name, "/"); } if (!select || (*select)(selectDir)) { diff --git a/src/vsnprintf.c b/src/vsnprintf.c index cfbef00db..8d1752b91 100644 --- a/src/vsnprintf.c +++ b/src/vsnprintf.c @@ -76,7 +76,7 @@ int fl_vsnprintf(char* buffer, size_t bufsize, const char* format, va_list ap) { } else sign = 0; if (*format == '*') { - // Get width from argument... + /* Get width from argument... */ format ++; width = va_arg(ap, int); snprintf(tptr, sizeof(tformat) - (tptr - tformat), "%d", width); @@ -94,7 +94,7 @@ int fl_vsnprintf(char* buffer, size_t bufsize, const char* format, va_list ap) { format ++; if (*format == '*') { - // Get precision from argument... + /* Get precision from argument... */ format ++; prec = va_arg(ap, int); snprintf(tptr, sizeof(tformat) - (tptr - tformat), "%d", prec); |