diff options
| author | Tor Lillqvist <tml@iki.fi> | 2001-03-09 21:23:33 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2001-03-09 21:23:33 +0000 |
| commit | 31c5b1899ddd9eecea5065f5b9004413b72a0f2c (patch) | |
| tree | cd2b7b18e57f9a624b243f8804f9ad6cef907436 /gstrfuncs.c | |
| parent | 5c00c3497209ae2d5c59f32032ce02f2f0943d10 (diff) | |
Cygwin support contributed by Stefan Ondrejicka <ondrej@idata.sk>.
2001-02-21 Tor Lillqvist <tml@iki.fi>
Cygwin support contributed by Stefan Ondrejicka
<ondrej@idata.sk>. Hopefully I got it all in while simultaneously
adding support for auto*/libtool for mingw.
* Makefile.am: Changes for auto* support on Cygwin and Win32. Do
still distribute the hand-written makefiles and *.win32.in files,
though. Use GIO, GSPAWN and PLATFORMDEP macros set by configure.
Use -no-undefined. Pass -export-symbols glib.def to libtool.
* configure.in: Define G_PLATFORM_WIN32 on both pure Win32 (mingw)
and Cygwin. Add AC_CYGWIN, AC_EXEEXT and AC_LIBTOOL_WIN32_DLL
calls for Cygwin and mingw support. Check for %I64u guint64
format (in MS C library). Set G_MODULE_IMPL on mingw and
Cygwin. Use ac_object and ac_exeext. Set GIO, GSPAWN, PLATFORMDEP
and G_LIBS_EXTRA. Compile timeloop only on Unix. Define OS_WIN32
automake conditional on Win32.
* glib.h: Include gwin32.h also on Cygwin.
* gfileutils.c (get_contents_posix): Use O_BINARY (defined as 0 on
Unix) for Cygwin's sake.
* gtimer.c (GETTIME): Reduce #ifdefs, use a macro GETTIME().
* gconvert.c
* gthread.c
* gutf8.c
* gutils.c: For code needed both on Cygwin and native Win32,
test for G_PLATFORM_WIN32.
* gmarkup.h: Use G_BEGIN_DECLS and G_END_DECLS.
* gtypes.h: Refine GLIB_VAR definition. Also check for DLL_EXPORT
in case compiling a static library on Win32 or Cygwin.
* gwin32.c: No <direct.h> on Cygwin. No need for ftruncate() or
dirent emulation on Cygwin.
(get_package_directory_from_module) Convert return value from
GetModuleFileName() to POSIX path on Cygwin.
* tests/Makefile.am (progs_LDADD): Link with libglib, libgthread
and libgmodule as appropriate. Use -no-undefined.
* gbacktrace.c: Move #ifdefs around a bit on Win32.
* gshell.c (unquote_string_inplace): Make static.
Diffstat (limited to 'gstrfuncs.c')
| -rw-r--r-- | gstrfuncs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gstrfuncs.c b/gstrfuncs.c index cf9defb7c..0efc262e5 100644 --- a/gstrfuncs.c +++ b/gstrfuncs.c @@ -677,11 +677,11 @@ g_strsignal (gint signum) #ifdef HAVE_STRSIGNAL #if defined(G_OS_BEOS) || defined(G_WITH_CYGWIN) -extern const char * strsignal(int); -#else /* !G_OS_BEOS */ +extern const char *strsignal(int); +#else /* this is declared differently (const) in string.h on BeOS */ extern char *strsignal (int sig); -#endif /* !G_OS_BEOS */ +#endif /* !G_OS_BEOS && !G_WITH_CYGWIN */ return strsignal (signum); #elif NO_SYS_SIGLIST switch (signum) |