g_thread_create renamed to g_thread_create_full.

2001-05-22  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* glib.def: g_thread_create renamed to g_thread_create_full.

	* gthread.c: memcpy is not necessary here. We can simply use
	struct assignment.

	* gmessages.c: Fix compilation error on win32. Added
	GFileDescriptor, wich is gint on Unix and FILE* on win32.
This commit is contained in:
Sebastian Wilhelmi
2001-05-22 12:06:59 +00:00
committed by Sebastian Wilhelmi
parent 6e14aa4673
commit e2b7bedbde
14 changed files with 108 additions and 26 deletions

View File

@@ -1,3 +1,13 @@
2001-05-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.def: g_thread_create renamed to g_thread_create_full.
* gthread.c: memcpy is not necessary here. We can simply use
struct assignment.
* gmessages.c: Fix compilation error on win32. Added
GFileDescriptor, wich is gint on Unix and FILE* on win32.
2001-05-21 Andrew Lanoix <alanoix@umich.edu> 2001-05-21 Andrew Lanoix <alanoix@umich.edu>
*giowin32.c: G_IO_WIN32_WINDOWS_MESSAGES channels *giowin32.c: G_IO_WIN32_WINDOWS_MESSAGES channels

View File

@@ -1,3 +1,13 @@
2001-05-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.def: g_thread_create renamed to g_thread_create_full.
* gthread.c: memcpy is not necessary here. We can simply use
struct assignment.
* gmessages.c: Fix compilation error on win32. Added
GFileDescriptor, wich is gint on Unix and FILE* on win32.
2001-05-21 Andrew Lanoix <alanoix@umich.edu> 2001-05-21 Andrew Lanoix <alanoix@umich.edu>
*giowin32.c: G_IO_WIN32_WINDOWS_MESSAGES channels *giowin32.c: G_IO_WIN32_WINDOWS_MESSAGES channels

View File

@@ -1,3 +1,13 @@
2001-05-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.def: g_thread_create renamed to g_thread_create_full.
* gthread.c: memcpy is not necessary here. We can simply use
struct assignment.
* gmessages.c: Fix compilation error on win32. Added
GFileDescriptor, wich is gint on Unix and FILE* on win32.
2001-05-21 Andrew Lanoix <alanoix@umich.edu> 2001-05-21 Andrew Lanoix <alanoix@umich.edu>
*giowin32.c: G_IO_WIN32_WINDOWS_MESSAGES channels *giowin32.c: G_IO_WIN32_WINDOWS_MESSAGES channels

View File

@@ -1,3 +1,13 @@
2001-05-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.def: g_thread_create renamed to g_thread_create_full.
* gthread.c: memcpy is not necessary here. We can simply use
struct assignment.
* gmessages.c: Fix compilation error on win32. Added
GFileDescriptor, wich is gint on Unix and FILE* on win32.
2001-05-21 Andrew Lanoix <alanoix@umich.edu> 2001-05-21 Andrew Lanoix <alanoix@umich.edu>
*giowin32.c: G_IO_WIN32_WINDOWS_MESSAGES channels *giowin32.c: G_IO_WIN32_WINDOWS_MESSAGES channels

View File

@@ -1,3 +1,13 @@
2001-05-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.def: g_thread_create renamed to g_thread_create_full.
* gthread.c: memcpy is not necessary here. We can simply use
struct assignment.
* gmessages.c: Fix compilation error on win32. Added
GFileDescriptor, wich is gint on Unix and FILE* on win32.
2001-05-21 Andrew Lanoix <alanoix@umich.edu> 2001-05-21 Andrew Lanoix <alanoix@umich.edu>
*giowin32.c: G_IO_WIN32_WINDOWS_MESSAGES channels *giowin32.c: G_IO_WIN32_WINDOWS_MESSAGES channels

View File

@@ -1,3 +1,13 @@
2001-05-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.def: g_thread_create renamed to g_thread_create_full.
* gthread.c: memcpy is not necessary here. We can simply use
struct assignment.
* gmessages.c: Fix compilation error on win32. Added
GFileDescriptor, wich is gint on Unix and FILE* on win32.
2001-05-21 Andrew Lanoix <alanoix@umich.edu> 2001-05-21 Andrew Lanoix <alanoix@umich.edu>
*giowin32.c: G_IO_WIN32_WINDOWS_MESSAGES channels *giowin32.c: G_IO_WIN32_WINDOWS_MESSAGES channels

View File

@@ -1,3 +1,13 @@
2001-05-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.def: g_thread_create renamed to g_thread_create_full.
* gthread.c: memcpy is not necessary here. We can simply use
struct assignment.
* gmessages.c: Fix compilation error on win32. Added
GFileDescriptor, wich is gint on Unix and FILE* on win32.
2001-05-21 Andrew Lanoix <alanoix@umich.edu> 2001-05-21 Andrew Lanoix <alanoix@umich.edu>
*giowin32.c: G_IO_WIN32_WINDOWS_MESSAGES channels *giowin32.c: G_IO_WIN32_WINDOWS_MESSAGES channels

View File

@@ -1,3 +1,13 @@
2001-05-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.def: g_thread_create renamed to g_thread_create_full.
* gthread.c: memcpy is not necessary here. We can simply use
struct assignment.
* gmessages.c: Fix compilation error on win32. Added
GFileDescriptor, wich is gint on Unix and FILE* on win32.
2001-05-21 Andrew Lanoix <alanoix@umich.edu> 2001-05-21 Andrew Lanoix <alanoix@umich.edu>
*giowin32.c: G_IO_WIN32_WINDOWS_MESSAGES channels *giowin32.c: G_IO_WIN32_WINDOWS_MESSAGES channels

View File

@@ -531,7 +531,7 @@ EXPORTS
g_strsplit g_strsplit
g_strtod g_strtod
g_strup g_strup
g_thread_create g_thread_create_full
g_thread_error_quark g_thread_error_quark
g_thread_functions_for_glib_use g_thread_functions_for_glib_use
g_thread_join g_thread_join

View File

@@ -531,7 +531,7 @@ EXPORTS
g_strsplit g_strsplit
g_strtod g_strtod
g_strup g_strup
g_thread_create g_thread_create_full
g_thread_error_quark g_thread_error_quark
g_thread_functions_for_glib_use g_thread_functions_for_glib_use
g_thread_join g_thread_join

View File

@@ -44,6 +44,11 @@
#include <locale.h> #include <locale.h>
#include <errno.h> #include <errno.h>
#ifdef G_OS_WIN32
typedef FILE* GFileDescriptor;
#else
typedef gint GFileDescriptor;
#endif
/* --- structures --- */ /* --- structures --- */
typedef struct _GLogDomain GLogDomain; typedef struct _GLogDomain GLogDomain;
@@ -106,7 +111,7 @@ static char *fatal_msg_ptr = fatal_msg_buf;
/* Just use stdio. If we're out of memory, we're hosed anyway. */ /* Just use stdio. If we're out of memory, we're hosed anyway. */
#undef write #undef write
static inline int static inline int
dowrite (FILE *fd, dowrite (GFileDescriptor fd,
const void *buf, const void *buf,
unsigned int len) unsigned int len)
{ {
@@ -151,7 +156,7 @@ ensure_stdout_valid (void)
#endif #endif
static void static void
write_unsigned (gint fd, write_unsigned (GFileDescriptor fd,
gulong num, gulong num,
guint radix) guint radix)
{ {
@@ -197,14 +202,14 @@ write_unsigned (gint fd,
} }
static void static void
write_string (gint fd, write_string (GFileDescriptor fd,
gchar *string) gchar *string)
{ {
write (fd, string, strlen (string)); write (fd, string, strlen (string));
} }
static void static void
g_log_write_prefix (gint fd, g_log_write_prefix (GFileDescriptor fd,
GLogLevelFlags mask) GLogLevelFlags mask)
{ {
static GLogLevelFlags g_log_msg_prefix = G_LOG_LEVEL_ERROR | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_DEBUG; static GLogLevelFlags g_log_msg_prefix = G_LOG_LEVEL_ERROR | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_DEBUG;
@@ -573,11 +578,7 @@ g_log_default_handler (const gchar *log_domain,
const gchar *message, const gchar *message,
gpointer unused_data) gpointer unused_data)
{ {
#ifdef G_OS_WIN32 GFileDescriptor fd;
FILE *fd;
#else
gint fd;
#endif
gboolean in_recursion; gboolean in_recursion;
gboolean is_fatal; gboolean is_fatal;
GErrorFunc local_glib_error_func; GErrorFunc local_glib_error_func;

View File

@@ -176,7 +176,7 @@ g_static_mutex_init (GStaticMutex *mutex)
g_return_if_fail (mutex); g_return_if_fail (mutex);
memcpy (mutex, &init_mutex, sizeof (GStaticMutex)); *mutex = init_mutex;
} }
GMutex * GMutex *
@@ -221,7 +221,7 @@ g_static_rec_mutex_init (GStaticRecMutex *mutex)
g_return_if_fail (mutex); g_return_if_fail (mutex);
memcpy (mutex, &init_mutex, sizeof (GStaticRecMutex)); *mutex = init_mutex;
} }
void void
@@ -683,7 +683,7 @@ g_static_rw_lock_init (GStaticRWLock* lock)
g_return_if_fail (lock); g_return_if_fail (lock);
memcpy (lock, &init_lock, sizeof (GStaticRWLock)); *lock = init_lock;
} }
static void inline static void inline

View File

@@ -44,6 +44,11 @@
#include <locale.h> #include <locale.h>
#include <errno.h> #include <errno.h>
#ifdef G_OS_WIN32
typedef FILE* GFileDescriptor;
#else
typedef gint GFileDescriptor;
#endif
/* --- structures --- */ /* --- structures --- */
typedef struct _GLogDomain GLogDomain; typedef struct _GLogDomain GLogDomain;
@@ -106,7 +111,7 @@ static char *fatal_msg_ptr = fatal_msg_buf;
/* Just use stdio. If we're out of memory, we're hosed anyway. */ /* Just use stdio. If we're out of memory, we're hosed anyway. */
#undef write #undef write
static inline int static inline int
dowrite (FILE *fd, dowrite (GFileDescriptor fd,
const void *buf, const void *buf,
unsigned int len) unsigned int len)
{ {
@@ -151,7 +156,7 @@ ensure_stdout_valid (void)
#endif #endif
static void static void
write_unsigned (gint fd, write_unsigned (GFileDescriptor fd,
gulong num, gulong num,
guint radix) guint radix)
{ {
@@ -197,14 +202,14 @@ write_unsigned (gint fd,
} }
static void static void
write_string (gint fd, write_string (GFileDescriptor fd,
gchar *string) gchar *string)
{ {
write (fd, string, strlen (string)); write (fd, string, strlen (string));
} }
static void static void
g_log_write_prefix (gint fd, g_log_write_prefix (GFileDescriptor fd,
GLogLevelFlags mask) GLogLevelFlags mask)
{ {
static GLogLevelFlags g_log_msg_prefix = G_LOG_LEVEL_ERROR | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_DEBUG; static GLogLevelFlags g_log_msg_prefix = G_LOG_LEVEL_ERROR | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_DEBUG;
@@ -573,11 +578,7 @@ g_log_default_handler (const gchar *log_domain,
const gchar *message, const gchar *message,
gpointer unused_data) gpointer unused_data)
{ {
#ifdef G_OS_WIN32 GFileDescriptor fd;
FILE *fd;
#else
gint fd;
#endif
gboolean in_recursion; gboolean in_recursion;
gboolean is_fatal; gboolean is_fatal;
GErrorFunc local_glib_error_func; GErrorFunc local_glib_error_func;

View File

@@ -176,7 +176,7 @@ g_static_mutex_init (GStaticMutex *mutex)
g_return_if_fail (mutex); g_return_if_fail (mutex);
memcpy (mutex, &init_mutex, sizeof (GStaticMutex)); *mutex = init_mutex;
} }
GMutex * GMutex *
@@ -221,7 +221,7 @@ g_static_rec_mutex_init (GStaticRecMutex *mutex)
g_return_if_fail (mutex); g_return_if_fail (mutex);
memcpy (mutex, &init_mutex, sizeof (GStaticRecMutex)); *mutex = init_mutex;
} }
void void
@@ -683,7 +683,7 @@ g_static_rw_lock_init (GStaticRWLock* lock)
g_return_if_fail (lock); g_return_if_fail (lock);
memcpy (lock, &init_lock, sizeof (GStaticRWLock)); *lock = init_lock;
} }
static void inline static void inline