luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-24 03:02:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

config.h.win32.in glib/galloca.h glib/gbacktrace.h glib/gwin32.c

Browse Source 
2007-01-17  Tor Lillqvist  <tml@novell.com>

	* config.h.win32.in
	* glib/galloca.h
	* glib/gbacktrace.h
	* glib/gwin32.c
	* glibconfig.h.win32.in
	* README.win32: More minor tweaks for Digital Mars
	compiler. (#346808, Serhat Sevki Dincer)


svn path=/branches/glib-2-12/; revision=5293
This commit is contained in:
Tor Lillqvist 2007-01-18 19:04:08 +00:00 committed by Tor Lillqvist
parent 1fca3b7545
commit 761a1869ce
7 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2007-01-17 Tor Lillqvist <tml@novell.com>
* config.h.win32.in
* glib/galloca.h
* glib/gbacktrace.h
* glib/gwin32.c
* glibconfig.h.win32.in
* README.win32: More minor tweaks for Digital Mars
compiler. (#346808, Serhat Sevki Dincer)
2007-01-17 Tor Lillqvist <tml@novell.com> 2007-01-17 Tor Lillqvist <tml@novell.com>
* makefile.mingw * makefile.mingw

1
README.win32
View File

@ -49,6 +49,7 @@ available in all source files that include <glib.h> or GTK+ headers.
Additionally, there are the compiler-specific macros: Additionally, there are the compiler-specific macros:
- __GNUC__ is defined when using gcc - __GNUC__ is defined when using gcc
- _MSC_VER is defined when using the Microsoft compiler - _MSC_VER is defined when using the Microsoft compiler
- __DMC__ is defined when using the Digital Mars C/C++ compiler
G_OS_WIN32 implies using the Microsoft C runtime MSVCRT.DLL. GLib is G_OS_WIN32 implies using the Microsoft C runtime MSVCRT.DLL. GLib is
not known to work with the older CRTDLL.DLL runtime, or the static not known to work with the older CRTDLL.DLL runtime, or the static

42
config.h.win32.in
View File

@ -83,11 +83,11 @@
#define G_HAVE___INLINE 1 #define G_HAVE___INLINE 1
/* Have __inline__ keyword */ /* Have __inline__ keyword */
#ifndef _MSC_VER #if !defined(_MSC_VER) && !defined(__DMC__)
#define G_HAVE___INLINE__ 1 #define G_HAVE___INLINE__ 1
#else /* _MSC_VER */ #else /* _MSC_VER or __DMC__ */
/* #undef G_HAVE___INLINE__ */ /* #undef G_HAVE___INLINE__ */
#endif /* _MSC_VER */ #endif /* _MSC_VER or __DMC__ */
/* Source file containing theread implementation */ /* Source file containing theread implementation */
#define G_THREAD_SOURCE "gthread-win32.c" #define G_THREAD_SOURCE "gthread-win32.c"
@ -263,6 +263,9 @@
/* Define to 1 if you have the `snprintf' function. */ /* Define to 1 if you have the `snprintf' function. */
#ifndef _MSC_VER #ifndef _MSC_VER
#define HAVE_SNPRINTF 1 #define HAVE_SNPRINTF 1
#ifdef __DMC__
#define snprintf _snprintf
#endif
#else /* _MSC_VER */ #else /* _MSC_VER */
/* #undef HAVE_SNPRINTF */ /* #undef HAVE_SNPRINTF */
#endif /* _MSC_VER */ #endif /* _MSC_VER */
@ -292,21 +295,21 @@
/* #undef HAVE_STPCPY */ /* #undef HAVE_STPCPY */
/* Define to 1 if you have the `strcasecmp' function. */ /* Define to 1 if you have the `strcasecmp' function. */
#ifndef _MSC_VER #if !defined(_MSC_VER) && !defined(__DMC__)
#define HAVE_STRCASECMP 1 #define HAVE_STRCASECMP 1
#else /* _MSC_VER */ #else /* _MSC_VER or __DMC__ */
/* #undef HAVE_STRCASECMP */ /* #undef HAVE_STRCASECMP */
#endif /* _MSC_VER */ #endif /* _MSC_VER or __DMC__ */
/* Define to 1 if you have the `strerror' function. */ /* Define to 1 if you have the `strerror' function. */
#define HAVE_STRERROR 1 #define HAVE_STRERROR 1
/* Define to 1 if you have the <strings.h> header file. */ /* Define to 1 if you have the <strings.h> header file. */
#ifndef _MSC_VER #if !defined(_MSC_VER) && !defined(__DMC__)
#define HAVE_STRINGS_H 1 #define HAVE_STRINGS_H 1
#else /* _MSC_VER */ #else /* _MSC_VER or __DMC__ */
/* #undef HAVE_STRINGS_H */ /* #undef HAVE_STRINGS_H */
#endif /* _MSC_VER */ #endif /* _MSC_VER or __DMC__ */
/* Define to 1 if you have the <string.h> header file. */ /* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1 #define HAVE_STRING_H 1
@ -315,11 +318,11 @@
/* #undef HAVE_STRLCPY */ /* #undef HAVE_STRLCPY */
/* Define to 1 if you have the `strncasecmp' function. */ /* Define to 1 if you have the `strncasecmp' function. */
#ifndef _MSC_VER #if !defined(_MSC_VER) && !defined(__DMC__)
#define HAVE_STRNCASECMP 1 #define HAVE_STRNCASECMP 1
#else /* _MSC_VER */ #else /* _MSC_VER or __DMC__ */
/* #undef HAVE_STRNCASECMP */ /* #undef HAVE_STRNCASECMP */
#endif /* _MSC_VER */ #endif /* _MSC_VER or __DMC__ */
/* Define to 1 if you have the `strsignal' function. */ /* Define to 1 if you have the `strsignal' function. */
/* #undef HAVE_STRSIGNAL */ /* #undef HAVE_STRSIGNAL */
@ -328,11 +331,11 @@
/* #undef HAVE_SYMLINK */ /* #undef HAVE_SYMLINK */
/* Define to 1 if you have the <sys/param.h> header file. */ /* Define to 1 if you have the <sys/param.h> header file. */
#ifndef _MSC_VER #if !defined(_MSC_VER) && !defined(__DMC__)
#define HAVE_SYS_PARAM_H 1 #define HAVE_SYS_PARAM_H 1
#else /* _MSC_VER */ #else /* _MSC_VER or __DMC__ */
/* #undef HAVE_SYS_PARAM_H */ /* #undef HAVE_SYS_PARAM_H */
#endif /* _MSC_VER */ #endif /* _MSC_VER or __DMC__ */
/* Define to 1 if you have the <sys/poll.h> header file. */ /* Define to 1 if you have the <sys/poll.h> header file. */
/* #undef HAVE_SYS_POLL_H */ /* #undef HAVE_SYS_POLL_H */
@ -371,11 +374,11 @@
/* #undef HAVE_UNSETENV */ /* #undef HAVE_UNSETENV */
/* Define to 1 if you have the <values.h> header file. */ /* Define to 1 if you have the <values.h> header file. */
#ifndef _MSC_VER #if !defined(_MSC_VER) && !defined(__DMC__)
#define HAVE_VALUES_H 1 #define HAVE_VALUES_H 1
#else /* _MSC_VER */ #else /* _MSC_VER or __DMC__ */
/* #undef HAVE_VALUES_H */ /* #undef HAVE_VALUES_H */
#endif /* _MSC_VER */ #endif /* _MSC_VER or __DMC__ */
/* Define to 1 if you have the `vasprintf' function. */ /* Define to 1 if you have the `vasprintf' function. */
#define HAVE_VASPRINTF 1 #define HAVE_VASPRINTF 1
@ -386,6 +389,9 @@
/* Define to 1 if you have the `vsnprintf' function. */ /* Define to 1 if you have the `vsnprintf' function. */
#ifndef _MSC_VER #ifndef _MSC_VER
#define HAVE_VSNPRINTF 1 #define HAVE_VSNPRINTF 1
#ifdef __DMC__
#define vsnprintf _vsnprintf
#endif
#else /* _MSC_VER */ #else /* _MSC_VER */
/* #undef HAVE_VSNPRINTF */ /* #undef HAVE_VSNPRINTF */
#endif /* _MSC_VER */ #endif /* _MSC_VER */

4
glib/galloca.h
View File

@ -40,7 +40,7 @@
# if defined(_MSC_VER) || defined(__DMC__) # if defined(_MSC_VER) || defined(__DMC__)
# include <malloc.h> # include <malloc.h>
# define alloca _alloca # define alloca _alloca
# else /* !_MSC_VER */ # else /* !_MSC_VER && !__DMC__ */
# ifdef _AIX # ifdef _AIX
# pragma alloca # pragma alloca
# else /* !_AIX */ # else /* !_AIX */
@ -50,7 +50,7 @@ char *alloca ();
G_END_DECLS G_END_DECLS
# endif /* !alloca */ # endif /* !alloca */
# endif /* !_AIX */ # endif /* !_AIX */
# endif /* !_MSC_VER */ # endif /* !_MSC_VER && !__DMC__ */
#endif /* !__GNUC__ && !GLIB_HAVE_ALLOCA_H */ #endif /* !__GNUC__ && !GLIB_HAVE_ALLOCA_H */
#define g_alloca(size) alloca (size) #define g_alloca(size) alloca (size)

2
glib/gbacktrace.h
View File

@ -48,7 +48,7 @@ void g_on_error_stack_trace (const gchar *prg_name);
*/ */
#if (defined (__i386__) || defined (__x86_64__)) && defined (__GNUC__) && __GNUC__ >= 2 #if (defined (__i386__) || defined (__x86_64__)) && defined (__GNUC__) && __GNUC__ >= 2
# define G_BREAKPOINT() G_STMT_START{ __asm__ __volatile__ ("int $03"); }G_STMT_END # define G_BREAKPOINT() G_STMT_START{ __asm__ __volatile__ ("int $03"); }G_STMT_END
#elif defined (_MSC_VER) && defined (_M_IX86) #elif (defined (_MSC_VER) || defined (__DMC__)) && defined (_M_IX86)
# define G_BREAKPOINT() G_STMT_START{ __asm int 3h }G_STMT_END # define G_BREAKPOINT() G_STMT_START{ __asm int 3h }G_STMT_END
#elif defined (__alpha__) && !defined(__osf__) && defined (__GNUC__) && __GNUC__ >= 2 #elif defined (__alpha__) && !defined(__osf__) && defined (__GNUC__) && __GNUC__ >= 2
# define G_BREAKPOINT() G_STMT_START{ __asm__ __volatile__ ("bpt"); }G_STMT_END # define G_BREAKPOINT() G_STMT_START{ __asm__ __volatile__ ("bpt"); }G_STMT_END

4
glib/gwin32.c
View File

@ -47,9 +47,9 @@
#endif #endif
#include <errno.h> #include <errno.h>
#include <ctype.h> #include <ctype.h>
#ifdef _MSC_VER #if defined(_MSC_VER) || defined(__DMC__)
# include <io.h> # include <io.h>
#endif /* _MSC_VER */ #endif /* _MSC_VER || __DMC__ */
#include "glib.h" #include "glib.h"
#include "galias.h" #include "galias.h"

17
glibconfig.h.win32.in
View File

@ -108,26 +108,17 @@ typedef unsigned int gsize;
#define G_HAVE_INLINE 1 #define G_HAVE_INLINE 1
#endif /* _MSC_VER */ #endif /* _MSC_VER */
#define G_HAVE___INLINE 1 #define G_HAVE___INLINE 1
#ifndef _MSC_VER #if !defined(_MSC_VER) && !defined(__DMC__)
#define G_HAVE___INLINE__ 1 #define G_HAVE___INLINE__ 1
#endif /* not _MSC_VER */ #endif /* !_MSC_VER and !__DMC__ */
#endif /* !__cplusplus */ #endif /* !__cplusplus */
#ifdef __cplusplus #if defined(__cplusplus) || !defined(_MSC_VER)
#define G_CAN_INLINE 1 #define G_CAN_INLINE 1
#else /* !__cplusplus */
#ifndef _MSC_VER
#define G_CAN_INLINE 1
#endif
#endif #endif
#ifndef _MSC_VER #ifndef _MSC_VER
#ifndef __cplusplus #define G_HAVE_ISO_VARARGS 1
# define G_HAVE_ISO_VARARGS 1
#endif
#ifdef __cplusplus
# define G_HAVE_ISO_VARARGS 1
#endif
/* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi /* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi
* is passed ISO vararg support is turned off, and there is no work * is passed ISO vararg support is turned off, and there is no work