Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Pryor <jpryor@novell.com>2006-11-15 19:03:37 +0300
committerJonathan Pryor <jpryor@novell.com>2006-11-15 19:03:37 +0300
commitb25e68591d968a43fb03f0379a8b7d7be497dc6f (patch)
tree3e2d1a6202ee15d26f06807cd0205ddba83ce343 /support
parent57c6a8234e083b639a5c894dcbadf3cf270ec639 (diff)
* map.c: Flush (removes warnings due to _cnm_return_val_if_overflow()).
svn path=/trunk/mono/; revision=67933
Diffstat (limited to 'support')
-rw-r--r--support/ChangeLog4
-rw-r--r--support/map.c6
2 files changed, 8 insertions, 2 deletions
diff --git a/support/ChangeLog b/support/ChangeLog
index 8d0bc834774..863e6da8c94 100644
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-15 Jonathan Pryor <jonpryor@vt.edu>
+
+ * map.c: Flush (removes warnings due to _cnm_return_val_if_overflow()).
+
2006-11-14 Jonathan Pryor <jonpryor@vt.edu>
* map.c: Flush (fixes FilePermissions conversion, allowing Syscall.stat() to
diff --git a/support/map.c b/support/map.c
index 40faa84e72d..01d26d9f9eb 100644
--- a/support/map.c
+++ b/support/map.c
@@ -205,8 +205,10 @@
#endif
#define _cnm_return_val_if_overflow(to_t,from,val) G_STMT_START { \
- if (!(_cnm_integral_type_min(to_t) <= from && \
- ((from < 0) || (from <= _cnm_integral_type_max(to_t))))) { \
+ gint64 sf = (gint64) from; \
+ guint64 uf = (guint64) from; \
+ if (!(_cnm_integral_type_min(to_t) <= sf && \
+ ((from < 0) || (uf <= _cnm_integral_type_max(to_t))))) { \
_cnm_dump_(to_t, from); \
errno = EOVERFLOW; \
return (val); \