diff options
| author | Greg Ercolano <erco@seriss.com> | 2009-03-14 02:11:31 +0000 |
|---|---|---|
| committer | Greg Ercolano <erco@seriss.com> | 2009-03-14 02:11:31 +0000 |
| commit | 50a92455febba116be7a9d1bbeb46d4f2f6a6143 (patch) | |
| tree | c7357ac35bd1173623329d0fd87aa5c76b3295f1 /src/fl_call_main.c | |
| parent | 923479622ffce8a2db0807c16437f4e66e53cbb7 (diff) | |
Fixes for SGI builds (STR#2174)
1) C++ style comments in C files converted to /* */
2) #warning's had to be #ifdef'ed out (#if !defined(sgi)..)
With these mods, 1.3.x compiles on IRIX 6.5 with no failures.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6680 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/fl_call_main.c')
| -rw-r--r-- | src/fl_call_main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/fl_call_main.c b/src/fl_call_main.c index b244498de..88be74fde 100644 --- a/src/fl_call_main.c +++ b/src/fl_call_main.c @@ -64,7 +64,7 @@ extern int main(int, char *[]); # define __argv _argv # endif /* BORLAND5 */ -//static int mbcs2utf(const char *s, int l, char *dst, unsigned dstlen) +/* static int mbcs2utf(const char *s, int l, char *dst, unsigned dstlen) */ static int mbcs2utf(const char *s, int l, char *dst) { static xchar *mbwbuf; @@ -73,7 +73,7 @@ static int mbcs2utf(const char *s, int l, char *dst) dstlen = (l * 6) + 6; mbwbuf = (xchar*)malloc(dstlen * sizeof(xchar)); l = mbstowcs(mbwbuf, s, l); -//l = fl_unicode2utf(mbwbuf, l, dst); +/* l = fl_unicode2utf(mbwbuf, l, dst); */ l = fl_utf8fromwc(dst, dstlen, mbwbuf, l); dst[l] = 0; free(mbwbuf); @@ -108,17 +108,17 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, int l; unsigned dstlen; if (__wargv ) { - for (l = 0; __wargv[i] && __wargv[i][l]; l++) {}; // is this just wstrlen??? + for (l = 0; __wargv[i] && __wargv[i][l]; l++) {}; /* is this just wstrlen??? */ dstlen = (l * 5) + 1; ar[i] = (char*) malloc(dstlen); -// ar[i][fl_unicode2utf(__wargv[i], l, ar[i])] = 0; +/* ar[i][fl_unicode2utf(__wargv[i], l, ar[i])] = 0; */ dstlen = fl_utf8fromwc(ar[i], dstlen, __wargv[i], l); ar[i][dstlen] = 0; } else { for (l = 0; __argv[i] && __argv[i][l]; l++) {}; dstlen = (l * 5) + 1; ar[i] = (char*) malloc(dstlen); -// ar[i][mbcs2utf(__argv[i], l, ar[i], dstlen)] = 0; +/* ar[i][mbcs2utf(__argv[i], l, ar[i], dstlen)] = 0; */ ar[i][mbcs2utf(__argv[i], l, ar[i])] = 0; } i++; @@ -139,7 +139,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, #elif defined(__hpux) /* This code to prevent "empty translation unit" or similar warnings... */ static void dummy(void) {} -#endif // WIN32 && !FL_DLL && !__GNUC__ +#endif /* WIN32 && !FL_DLL && !__GNUC__ */ /* * End of "$Id$". |