summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2005-09-26 15:48:06 +0000
committerCarl Worth <cworth@cworth.org>2005-09-26 15:48:06 +0000
commit8b4d49921db1b77da8814ed59ba50a53b716a59b (patch)
tree1b9034214c68ad527dee8a14987e140a7922fa42
parentae40e31976c462a56701322345ca8f14a3c82dd5 (diff)
Backported from HEAD:
Portability improvements for win32 thanks to Hans Breuer <hans@breuer.org>: Defined sized-integer types when under the influence of _MSC_VER and without stdint.h. Use #error which is more portable than #warning, (and more indicative of where we want to be before the next release).
-rw-r--r--ChangeLog15
-rw-r--r--pixman/src/pixman.h19
-rw-r--r--src/cairoint.h3
3 files changed, 30 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 0030c3582..fac05c091 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,21 @@
2005-09-26 Carl Worth <cworth@cworth.org>
Backported from HEAD:
+ 2005-09-07 Carl Worth <cworth@cworth.org>
+
+ Portability improvements for win32 thanks to Hans Breuer
+ <hans@breuer.org>:
+
+ * pixman/src/pixman.h: Defined sized-integer types when under the
+ influence of _MSC_VER and without stdint.h.
+
+ * src/cairoint.h: Use #error which is more portable than #warning,
+ (and more indicative of where we want to be before the next
+ release).
+
+2005-09-26 Carl Worth <cworth@cworth.org>
+
+ Backported from HEAD:
2005-08-31 Owen Taylor <otaylor@redhat.com>
* test/cairo-test.c: Protect inclusion of fontconfig.h
diff --git a/pixman/src/pixman.h b/pixman/src/pixman.h
index ee8455bed..994475b4e 100644
--- a/pixman/src/pixman.h
+++ b/pixman/src/pixman.h
@@ -54,7 +54,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $Id: pixman.h,v 1.22 2005-08-10 19:36:51 cworth Exp $ */
+/* $Id: pixman.h,v 1.22.4.1 2005-09-26 22:48:06 cworth Exp $ */
/* libic.h */
@@ -83,12 +83,19 @@ SOFTWARE.
#if defined (__SVR4) && defined (__sun)
# include <sys/int_types.h>
+#elif defined (__OpenBSD__) || defined (_AIX)
+# include <inttypes.h>
+#elif defined (_MSC_VER)
+ typedef __int8 int8_t;
+ typedef unsigned __int8 uint8_t;
+ typedef __int16 int16_t;
+ typedef unsigned __int16 uint16_t;
+ typedef __int32 int32_t;
+ typedef unsigned __int32 uint32_t;
+ typedef __int64 int64_t;
+ typedef unsigned __int64 uint64_t;
#else
-# if defined (__OpenBSD__) || defined (_AIX)
-# include <inttypes.h>
-# else
-# include <stdint.h>
-# endif
+# include <stdint.h>
#endif
#include "pixman-remap.h"
diff --git a/src/cairoint.h b/src/cairoint.h
index 585f1771f..80132deef 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -149,7 +149,8 @@
#endif
#ifndef CAIRO_MUTEX_DECLARE
-# warning "No mutex declarations, assuming single-threaded code"
+# error "No mutex declarations. Cairo will not work with multiple threads." \
+ "(Remove this #error directive to acknowledge & accept this limitation)."
# define CAIRO_MUTEX_DECLARE(name)
# define CAIRO_MUTEX_DECLARE_GLOBAL(name)
# define CAIRO_MUTEX_LOCK(name)