Merge
This commit is contained in:
commit
9e54325944
|
@ -1,16 +0,0 @@
|
||||||
--- glibconfig.h.orig 2010-09-27 22:23:56 +0000
|
|
||||||
+++ glibconfig.h 2010-09-29 01:31:32 +0000
|
|
||||||
@@ -107,9 +107,13 @@
|
|
||||||
#ifdef __cplusplus
|
|
||||||
#define G_HAVE_INLINE 1
|
|
||||||
#else /* !__cplusplus */
|
|
||||||
+#ifndef _MSC_VER
|
|
||||||
#define G_HAVE_INLINE 1
|
|
||||||
+#endif /* _MSC_VER */
|
|
||||||
#define G_HAVE___INLINE 1
|
|
||||||
+#if !defined(_MSC_VER) && !defined(__DMC__)
|
|
||||||
#define G_HAVE___INLINE__ 1
|
|
||||||
+#endif /* !_MSC_VER and !__DMC__ */
|
|
||||||
#endif /* !__cplusplus */
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
Loading…
Reference in New Issue