Commit 7ea73a01 authored by Manish Singh's avatar Manish Singh

G_OS_FOO #defines. I *think* I got the cygwin and beos stuff right, but

I haven't tested it. The respective porters should fix any screwups

-Yosh
parent 4944d4df
Sun Oct 3 19:25:42 PDT 1999 Manish Singh <yosh@gimp.org>
* acconfig.h
* configure.in
* glibconfig.h.win32: G_OS_FOO #defines. I *think* I got the cygwin
and beos stuff right, but I haven't tested it. The respective
porters should fix any screwups
* glib.h
* gerror.c
* gmain.c
* gmessages.c
* gscanner.c
* gthread.c
* gtimer.c
* gutils.c
* testglib.c: use G_OS stuff
Wed Sep 22 01:53:18 1999 Tim Janik <timj@gtk.org>
* glib.h (NULL): define NULL as (0L) if __cplusplus is defined, to
......
Sun Oct 3 19:25:42 PDT 1999 Manish Singh <yosh@gimp.org>
* acconfig.h
* configure.in
* glibconfig.h.win32: G_OS_FOO #defines. I *think* I got the cygwin
and beos stuff right, but I haven't tested it. The respective
porters should fix any screwups
* glib.h
* gerror.c
* gmain.c
* gmessages.c
* gscanner.c
* gthread.c
* gtimer.c
* gutils.c
* testglib.c: use G_OS stuff
Wed Sep 22 01:53:18 1999 Tim Janik <timj@gtk.org>
* glib.h (NULL): define NULL as (0L) if __cplusplus is defined, to
......
Sun Oct 3 19:25:42 PDT 1999 Manish Singh <yosh@gimp.org>
* acconfig.h
* configure.in
* glibconfig.h.win32: G_OS_FOO #defines. I *think* I got the cygwin
and beos stuff right, but I haven't tested it. The respective
porters should fix any screwups
* glib.h
* gerror.c
* gmain.c
* gmessages.c
* gscanner.c
* gthread.c
* gtimer.c
* gutils.c
* testglib.c: use G_OS stuff
Wed Sep 22 01:53:18 1999 Tim Janik <timj@gtk.org>
* glib.h (NULL): define NULL as (0L) if __cplusplus is defined, to
......
Sun Oct 3 19:25:42 PDT 1999 Manish Singh <yosh@gimp.org>
* acconfig.h
* configure.in
* glibconfig.h.win32: G_OS_FOO #defines. I *think* I got the cygwin
and beos stuff right, but I haven't tested it. The respective
porters should fix any screwups
* glib.h
* gerror.c
* gmain.c
* gmessages.c
* gscanner.c
* gthread.c
* gtimer.c
* gutils.c
* testglib.c: use G_OS stuff
Wed Sep 22 01:53:18 1999 Tim Janik <timj@gtk.org>
* glib.h (NULL): define NULL as (0L) if __cplusplus is defined, to
......
Sun Oct 3 19:25:42 PDT 1999 Manish Singh <yosh@gimp.org>
* acconfig.h
* configure.in
* glibconfig.h.win32: G_OS_FOO #defines. I *think* I got the cygwin
and beos stuff right, but I haven't tested it. The respective
porters should fix any screwups
* glib.h
* gerror.c
* gmain.c
* gmessages.c
* gscanner.c
* gthread.c
* gtimer.c
* gutils.c
* testglib.c: use G_OS stuff
Wed Sep 22 01:53:18 1999 Tim Janik <timj@gtk.org>
* glib.h (NULL): define NULL as (0L) if __cplusplus is defined, to
......
Sun Oct 3 19:25:42 PDT 1999 Manish Singh <yosh@gimp.org>
* acconfig.h
* configure.in
* glibconfig.h.win32: G_OS_FOO #defines. I *think* I got the cygwin
and beos stuff right, but I haven't tested it. The respective
porters should fix any screwups
* glib.h
* gerror.c
* gmain.c
* gmessages.c
* gscanner.c
* gthread.c
* gtimer.c
* gutils.c
* testglib.c: use G_OS stuff
Wed Sep 22 01:53:18 1999 Tim Janik <timj@gtk.org>
* glib.h (NULL): define NULL as (0L) if __cplusplus is defined, to
......
Sun Oct 3 19:25:42 PDT 1999 Manish Singh <yosh@gimp.org>
* acconfig.h
* configure.in
* glibconfig.h.win32: G_OS_FOO #defines. I *think* I got the cygwin
and beos stuff right, but I haven't tested it. The respective
porters should fix any screwups
* glib.h
* gerror.c
* gmain.c
* gmessages.c
* gscanner.c
* gthread.c
* gtimer.c
* gutils.c
* testglib.c: use G_OS stuff
Wed Sep 22 01:53:18 1999 Tim Janik <timj@gtk.org>
* glib.h (NULL): define NULL as (0L) if __cplusplus is defined, to
......
Sun Oct 3 19:25:42 PDT 1999 Manish Singh <yosh@gimp.org>
* acconfig.h
* configure.in
* glibconfig.h.win32: G_OS_FOO #defines. I *think* I got the cygwin
and beos stuff right, but I haven't tested it. The respective
porters should fix any screwups
* glib.h
* gerror.c
* gmain.c
* gmessages.c
* gscanner.c
* gthread.c
* gtimer.c
* gutils.c
* testglib.c: use G_OS stuff
Wed Sep 22 01:53:18 1999 Tim Janik <timj@gtk.org>
* glib.h (NULL): define NULL as (0L) if __cplusplus is defined, to
......
......@@ -95,16 +95,11 @@
#undef GLIB_INTERFACE_AGE
#undef GLIB_BINARY_AGE
#undef WIN32
#undef NATIVE_WIN32
#undef G_THREAD_SOURCE
#undef POSIX_MIN_PRIORITY
#undef POSIX_MAX_PRIORITY
#undef POSIX_YIELD_FUNC
#undef GLIB_NATIVE_BEOS
/* #undef PACKAGE */
/* #undef VERSION */
......
......@@ -82,15 +82,13 @@ AC_CANONICAL_HOST
AC_MSG_CHECKING(for the BeOS)
case $host in
*-*-beos*)
AC_DEFINE(GLIB_NATIVE_BEOS, 1)
glib_native_beos="yes"
AC_MSG_RESULT([$glib_native_beos])
;;
default)
*)
glib_native_beos="no"
AC_MSG_RESULT($glib_native_beos)
;;
esac
AC_MSG_RESULT([$glib_native_beos])
dnl figure debugging default, prior to $ac_help setup
dnl
......@@ -1114,6 +1112,7 @@ _______EOF
$glib_atexit
$glib_memmove
$glib_defines
$glib_os
$glib_vacopy
......@@ -1213,6 +1212,7 @@ _______EOF
fi
cat >>$outfile <<_______EOF
#ifdef __cplusplus
}
#endif /* __cplusplus */
......@@ -1428,10 +1428,18 @@ g_mutex_sizeof="$glib_cv_sizeof_gmutex"
g_mutex_contents="$glib_cv_byte_contents_gmutex"
g_recmutex_contents="$glib_cv_byte_contents_grecmutex"
if test "x$glib_native_beos" = "xyes"; then
glib_native_beos_def="\$glib_native_beos_def
#define GLIB_NATIVE_BEOS 1"
fi
case $host in
*-*-beos*)
glib_os="#define G_OS_BEOS"
;;
*-*-cygwin*)
glib_os="#define G_OS_UNIX
#define G_OS_FEATURE_CYGWIN"
;;
*)
glib_os="#define G_OS_UNIX"
;;
esac
])
AC_OUTPUT([
......
......@@ -59,7 +59,7 @@
#include <string.h> /* for bzero on BSD systems */
#endif
#ifdef NATIVE_WIN32
#ifdef G_OS_WIN32
# define STRICT /* Strict typing, please */
# include <windows.h>
# include <process.h> /* For _getpid() */
......@@ -84,7 +84,7 @@ volatile gboolean glib_on_error_halt = TRUE;
void
g_on_error_query (const gchar *prg_name)
{
#ifndef NATIVE_WIN32
#ifndef G_OS_WIN32
static const gchar *query1 = "[E]xit, [H]alt";
static const gchar *query2 = ", show [S]tack trace";
static const gchar *query3 = " or [P]roceed";
......@@ -111,14 +111,10 @@ g_on_error_query (const gchar *prg_name)
query3);
fflush (stdout);
#ifndef NATIVE_WIN32
if (isatty(0) && isatty(1))
fgets (buf, 8, stdin);
else
strcpy (buf, "E\n");
#else
fgets (buf, 8, stdin);
#endif
if ((buf[0] == 'E' || buf[0] == 'e')
&& buf[1] == '\n')
......@@ -157,7 +153,7 @@ g_on_error_query (const gchar *prg_name)
void
g_on_error_stack_trace (const gchar *prg_name)
{
#if !defined(NATIVE_WIN32) && ! defined(GLIB_NATIVE_BEOS)
#ifdef G_OS_UNIX
pid_t pid;
gchar buf[16];
gchar *args[4] = { "gdb", NULL, NULL, NULL };
......@@ -201,7 +197,7 @@ stack_trace_sigchld (int signum)
static void
stack_trace (char **args)
{
#if !defined(NATIVE_WIN32) && !defined(GLIB_NATIVE_BEOS)
#ifdef G_OS_UNIX
pid_t pid;
int in_fd[2];
int out_fd[2];
......
......@@ -59,7 +59,7 @@
#include <string.h> /* for bzero on BSD systems */
#endif
#ifdef NATIVE_WIN32
#ifdef G_OS_WIN32
# define STRICT /* Strict typing, please */
# include <windows.h>
# include <process.h> /* For _getpid() */
......@@ -84,7 +84,7 @@ volatile gboolean glib_on_error_halt = TRUE;
void
g_on_error_query (const gchar *prg_name)
{
#ifndef NATIVE_WIN32
#ifndef G_OS_WIN32
static const gchar *query1 = "[E]xit, [H]alt";
static const gchar *query2 = ", show [S]tack trace";
static const gchar *query3 = " or [P]roceed";
......@@ -111,14 +111,10 @@ g_on_error_query (const gchar *prg_name)
query3);
fflush (stdout);
#ifndef NATIVE_WIN32
if (isatty(0) && isatty(1))
fgets (buf, 8, stdin);
else
strcpy (buf, "E\n");
#else
fgets (buf, 8, stdin);
#endif
if ((buf[0] == 'E' || buf[0] == 'e')
&& buf[1] == '\n')
......@@ -157,7 +153,7 @@ g_on_error_query (const gchar *prg_name)
void
g_on_error_stack_trace (const gchar *prg_name)
{
#if !defined(NATIVE_WIN32) && ! defined(GLIB_NATIVE_BEOS)
#ifdef G_OS_UNIX
pid_t pid;
gchar buf[16];
gchar *args[4] = { "gdb", NULL, NULL, NULL };
......@@ -201,7 +197,7 @@ stack_trace_sigchld (int signum)
static void
stack_trace (char **args)
{
#if !defined(NATIVE_WIN32) && !defined(GLIB_NATIVE_BEOS)
#ifdef G_OS_UNIX
pid_t pid;
int in_fd[2];
int out_fd[2];
......
......@@ -72,7 +72,7 @@
#endif
#ifdef NATIVE_WIN32
#ifdef G_OS_WIN32
/* On native Win32, directory separator is the backslash, and search path
* separator is the semicolon.
......@@ -82,7 +82,7 @@
#define G_SEARCHPATH_SEPARATOR ';'
#define G_SEARCHPATH_SEPARATOR_S ";"
#else /* !NATIVE_WIN32 */
#else /* !G_OS_WIN32 */
/* Unix */
......@@ -91,7 +91,7 @@
#define G_SEARCHPATH_SEPARATOR ':'
#define G_SEARCHPATH_SEPARATOR_S ":"
#endif /* !NATIVE_WIN32 */
#endif /* !G_OS_WIN32 */
#ifdef __cplusplus
extern "C" {
......@@ -659,15 +659,15 @@ typedef gint32 GTime;
* we prefix variable declarations so they can
* properly get exported in windows dlls.
*/
#ifdef NATIVE_WIN32
#ifdef G_OS_WIN32
# ifdef GLIB_COMPILATION
# define GUTILS_C_VAR __declspec(dllexport)
# else /* !GLIB_COMPILATION */
# define GUTILS_C_VAR extern __declspec(dllimport)
# endif /* !GLIB_COMPILATION */
#else /* !NATIVE_WIN32 */
#else /* !G_OS_WIN32 */
# define GUTILS_C_VAR extern
#endif /* !NATIVE_WIN32 */
#endif /* !G_OS_WIN32 */
GUTILS_C_VAR const guint glib_major_version;
GUTILS_C_VAR const guint glib_minor_version;
......@@ -2692,7 +2692,7 @@ void g_main_set_poll_func (GPollFunc func);
GIOChannel* g_io_channel_unix_new (int fd);
gint g_io_channel_unix_get_fd (GIOChannel *channel);
#ifdef NATIVE_WIN32
#ifdef G_OS_WIN32
GUTILS_C_VAR guint g_pipe_readable_msg;
......@@ -2750,7 +2750,7 @@ GIOChannel *g_io_channel_win32_new_stream_socket (int socket);
/* Windows emulation stubs for common Unix functions
*/
#ifdef NATIVE_WIN32
#ifdef G_OS_WIN32
# define MAXPATHLEN 1024
#ifdef _MSC_VER
......@@ -2814,7 +2814,7 @@ DIR* gwin_opendir (const gchar *dirname);
struct dirent* gwin_readdir (DIR *dir);
void gwin_rewinddir (DIR *dir);
gint gwin_closedir (DIR *dir);
#endif /* NATIVE_WIN32 */
#endif /* G_OS_WIN32 */
/* GLib Thread support
......
......@@ -59,7 +59,7 @@
#include <string.h> /* for bzero on BSD systems */
#endif
#ifdef NATIVE_WIN32
#ifdef G_OS_WIN32
# define STRICT /* Strict typing, please */
# include <windows.h>
# include <process.h> /* For _getpid() */
......@@ -84,7 +84,7 @@ volatile gboolean glib_on_error_halt = TRUE;
void
g_on_error_query (const gchar *prg_name)
{
#ifndef NATIVE_WIN32
#ifndef G_OS_WIN32
static const gchar *query1 = "[E]xit, [H]alt";
static const gchar *query2 = ", show [S]tack trace";
static const gchar *query3 = " or [P]roceed";
......@@ -111,14 +111,10 @@ g_on_error_query (const gchar *prg_name)
query3);
fflush (stdout);
#ifndef NATIVE_WIN32
if (isatty(0) && isatty(1))
fgets (buf, 8, stdin);
else
strcpy (buf, "E\n");
#else
fgets (buf, 8, stdin);
#endif
if ((buf[0] == 'E' || buf[0] == 'e')
&& buf[1] == '\n')
......@@ -157,7 +153,7 @@ g_on_error_query (const gchar *prg_name)
void
g_on_error_stack_trace (const gchar *prg_name)
{
#if !defined(NATIVE_WIN32) && ! defined(GLIB_NATIVE_BEOS)
#ifdef G_OS_UNIX
pid_t pid;
gchar buf[16];
gchar *args[4] = { "gdb", NULL, NULL, NULL };
......@@ -201,7 +197,7 @@ stack_trace_sigchld (int signum)
static void
stack_trace (char **args)
{
#if !defined(NATIVE_WIN32) && !defined(GLIB_NATIVE_BEOS)
#ifdef G_OS_UNIX
pid_t pid;
int in_fd[2];
int out_fd[2];
......
......@@ -59,7 +59,7 @@
#include <string.h> /* for bzero on BSD systems */
#endif
#ifdef NATIVE_WIN32
#ifdef G_OS_WIN32
# define STRICT /* Strict typing, please */
# include <windows.h>
# include <process.h> /* For _getpid() */
......@@ -84,7 +84,7 @@ volatile gboolean glib_on_error_halt = TRUE;
void
g_on_error_query (const gchar *prg_name)
{
#ifndef NATIVE_WIN32
#ifndef G_OS_WIN32
static const gchar *query1 = "[E]xit, [H]alt";
static const gchar *query2 = ", show [S]tack trace";
static const gchar *query3 = " or [P]roceed";
......@@ -111,14 +111,10 @@ g_on_error_query (const gchar *prg_name)
query3);
fflush (stdout);
#ifndef NATIVE_WIN32
if (isatty(0) && isatty(1))
fgets (buf, 8, stdin);
else
strcpy (buf, "E\n");
#else
fgets (buf, 8, stdin);
#endif
if ((buf[0] == 'E' || buf[0] == 'e')
&& buf[1] == '\n')
......@@ -157,7 +153,7 @@ g_on_error_query (const gchar *prg_name)
void
g_on_error_stack_trace (const gchar *prg_name)
{
#if !defined(NATIVE_WIN32) && ! defined(GLIB_NATIVE_BEOS)
#ifdef G_OS_UNIX
pid_t pid;
gchar buf[16];
gchar *args[4] = { "gdb", NULL, NULL, NULL };
......@@ -201,7 +197,7 @@ stack_trace_sigchld (int signum)
static void
stack_trace (char **args)
{
#if !defined(NATIVE_WIN32) && !defined(GLIB_NATIVE_BEOS)
#ifdef G_OS_UNIX
pid_t pid;
int in_fd[2];
int out_fd[2];
......
......@@ -72,7 +72,7 @@
#endif
#ifdef NATIVE_WIN32
#ifdef G_OS_WIN32
/* On native Win32, directory separator is the backslash, and search path
* separator is the semicolon.
......@@ -82,7 +82,7 @@
#define G_SEARCHPATH_SEPARATOR ';'
#define G_SEARCHPATH_SEPARATOR_S ";"
#else /* !NATIVE_WIN32 */
#else /* !G_OS_WIN32 */
/* Unix */
......@@ -91,7 +91,7 @@
#define G_SEARCHPATH_SEPARATOR ':'
#define G_SEARCHPATH_SEPARATOR_S ":"
#endif /* !NATIVE_WIN32 */
#endif /* !G_OS_WIN32 */
#ifdef __cplusplus
extern "C" {
......@@ -659,15 +659,15 @@ typedef gint32 GTime;
* we prefix variable declarations so they can
* properly get exported in windows dlls.
*/
#ifdef NATIVE_WIN32
#ifdef G_OS_WIN32
# ifdef GLIB_COMPILATION
# define GUTILS_C_VAR __declspec(dllexport)
# else /* !GLIB_COMPILATION */
# define GUTILS_C_VAR extern __declspec(dllimport)
# endif /* !GLIB_COMPILATION */
#else /* !NATIVE_WIN32 */
#else /* !G_OS_WIN32 */
# define GUTILS_C_VAR extern
#endif /* !NATIVE_WIN32 */
#endif /* !G_OS_WIN32 */
GUTILS_C_VAR const guint glib_major_version;
GUTILS_C_VAR const guint glib_minor_version;
......@@ -2692,7 +2692,7 @@ void g_main_set_poll_func (GPollFunc func);
GIOChannel* g_io_channel_unix_new (int fd);
gint g_io_channel_unix_get_fd (GIOChannel *channel);
#ifdef NATIVE_WIN32
#ifdef G_OS_WIN32
GUTILS_C_VAR guint g_pipe_readable_msg;
......@@ -2750,7 +2750,7 @@ GIOChannel *g_io_channel_win32_new_stream_socket (int socket);
/* Windows emulation stubs for common Unix functions
*/
#ifdef NATIVE_WIN32
#ifdef G_OS_WIN32
# define MAXPATHLEN 1024
#ifdef _MSC_VER
......@@ -2814,7 +2814,7 @@ DIR* gwin_opendir (const gchar *dirname);
struct dirent* gwin_readdir (DIR *dir);
void gwin_rewinddir (DIR *dir);
gint gwin_closedir (DIR *dir);
#endif /* NATIVE_WIN32 */
#endif /* G_OS_WIN32 */
/* GLib Thread support
......
......@@ -54,14 +54,14 @@
#endif /* HAVE_UNISTD_H */
#include <errno.h>
#ifdef NATIVE_WIN32
#ifdef G_OS_WIN32
#define STRICT
#include <windows.h>
#endif /* NATIVE_WIN32 */
#endif /* G_OS_WIN32 */
#ifdef GLIB_NATIVE_BEOS
#ifdef G_OS_BEOS
#include <net/socket.h>
#endif /* GLIB_NATIVE_BEOS */
#endif /* G_OS_BEOS */
/* Types */
......@@ -168,13 +168,13 @@ static GMemChunk *poll_chunk;
static guint n_poll_records = 0;
#ifdef G_THREADS_ENABLED
#ifndef NATIVE_WIN32
#ifndef G_OS_WIN32
/* this pipe is used to wake up the main loop when a source is added.
*/
static gint wake_up_pipe[2] = { -1, -1 };
#else /* NATIVE_WIN32 */
#else /* G_OS_WIN32 */
static HANDLE wake_up_semaphore = NULL;
#endif /* NATIVE_WIN32 */
#endif /* G_OS_WIN32 */
static GPollFD wake_up_rec;
static gboolean poll_waiting = FALSE;
......@@ -189,7 +189,7 @@ extern gint poll (GPollFD *ufds, guint nfsd, gint timeout);
# endif /* !sun */
static GPollFunc poll_func = (GPollFunc) poll;
#else /* !HAVE_POLL */
#ifdef NATIVE_WIN32
#ifdef G_OS_WIN32
static gint
g_poll (GPollFD *fds, guint nfds, gint timeout)
......@@ -327,7 +327,7 @@ g_poll (GPollFD *fds, guint nfds, gint timeout)
return 1;
}
#else /* !NATIVE_WIN32 */
#else /* !G_OS_WIN32 */
/* The following implementation of poll() comes from the GNU C Library.
* Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc.
......@@ -339,9 +339,9 @@ g_poll (GPollFD *fds, guint nfds, gint timeout)
#include <sys/select.h>
#endif /* HAVE_SYS_SELECT_H */
#ifdef GLIB_NATIVE_BEOS
#ifdef G_OS_BEOS
#undef NO_FD_SET
#endif /* GLIB_NATIVE_BEOS */
#endif /* G_OS_BEOS */
#ifndef NO_FD_SET
# define SELECT_MASK fd_set
......@@ -407,7 +407,7 @@ g_poll (GPollFD *fds,
return ready;
}
#endif /* !NATIVE_WIN32 */
#endif /* !G_OS_WIN32 */
static GPollFunc poll_func = g_poll;
#endif /* !HAVE_POLL */
......@@ -591,7 +591,7 @@ g_source_remove_by_funcs_user_data (GSourceFuncs *funcs,
void
g_get_current_time (GTimeVal *result)
{
#ifndef NATIVE_WIN32
#ifndef G_OS_WIN32
struct timeval r;
g_return_if_fail (result != NULL);
......@@ -974,7 +974,7 @@ g_main_poll (gint timeout,
gint npoll;
#ifdef G_THREADS_ENABLED
#ifndef NATIVE_WIN32
#ifndef G_OS_WIN32
if (wake_up_pipe[0] < 0)
{
if (pipe (wake_up_pipe) < 0)
......@@ -1074,7 +1074,7 @@ g_main_poll (gint timeout,
#ifdef G_THREADS_ENABLED
if (!poll_waiting)
{
#ifndef NATIVE_WIN32
#ifndef G_OS_WIN32
gchar c;
read (wake_up_pipe[0], &c, 1);
#endif
......@@ -1222,7 +1222,7 @@ g_main_wakeup (void)
if (poll_waiting)
{
poll_waiting = FALSE;
#ifndef NATIVE_WIN32
#ifndef G_OS_WIN32
write (wake_up_pipe[1], "A", 1);
#else
ReleaseSemaphore (wake_up_semaphore, 1, NULL);
......
......@@ -42,7 +42,7 @@
#endif
#include <signal.h>
#ifdef NATIVE_WIN32
#ifdef G_OS_WIN32
# define STRICT
# include <windows.h>
# include <process.h> /* For _getpid() */
......@@ -424,7 +424,7 @@ g_log_default_handler (const gchar *log_domain,
const gchar *message,
gpointer unused_data)
{
#ifdef NATIVE_WIN32
#ifdef G_OS_WIN32
FILE *fd;
#else
gint fd;
......@@ -450,7 +450,7 @@ g_log_default_handler (const gchar *log_domain,
else
sprintf (prg_pid, " (pid:%u): ", getpid ());
#ifdef NATIVE_WIN32
#ifdef G_OS_WIN32
/* Use just stdout as stderr is hard to get redirected from the
* DOS prompt.
*/
......
......@@ -48,7 +48,7 @@
#include <errno.h>
#include <sys/types.h> /* needed for sys/stat.h */
#include <sys/stat.h>
#ifdef NATIVE_WIN32
#ifdef G_OS_WIN32
#include <io.h> /* For _read() */
#endif
......
......@@ -669,12 +669,12 @@ g_strsignal (gint signum)
char *msg;
#ifdef HAVE_STRSIGNAL
#ifdef GLIB_NATIVE_BEOS
#ifdef G_OS_BEOS
extern const char * strsignal(int);
#else /* !GLIB_NATIVE_BEOS */
#else /* !G_OS_BEOS */
/* this is declared differently (const) in string.h on BeOS */
extern char *strsignal (int sig);
#endif /* !GLIB_NATIVE_BEOS */
#endif /* !G_OS_BEOS */
return strsignal (signum);
#elif NO_SYS_SIGLIST
switch (signum)
......
......@@ -66,7 +66,7 @@ static void g_thread_fail (void);
gboolean g_thread_use_default_impl = TRUE;
gboolean g_threads_got_initialized = FALSE;
#if defined(NATIVE_WIN32) && defined(__GNUC__)
#if defined(G_OS_WIN32) && defined(__GNUC__)
__declspec(dllexport)
#endif
GThreadFunctions g_thread_functions_for_glib_use = {
......
......@@ -36,25 +36,25 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif /* HAVE_UNISTD_H */
#ifndef NATIVE_WIN32
#ifndef G_OS_WIN32
#include <sys/time.h>
#endif /* NATIVE_WIN32 */
#endif /* G_OS_WIN32 */
#ifdef NATIVE_WIN32
#ifdef G_OS_WIN32
#include <windows.h>
#endif /* NATIVE_WIN32 */
#endif /* G_OS_WIN32 */
typedef struct _GRealTimer GRealTimer;
struct _GRealTimer
{
#ifdef NATIVE_WIN32