Merge pull request #2810 from kumpera/fix_hazard_free

[mono.git] / mono / utils / memfuncs.c

diff --git a/mono/utils/memfuncs.c b/mono/utils/memfuncs.c
index c2a39d22b84287af5dbdab56066025cfaf13eb3e..455ffe77ea44acc865935bab96f757e0114e71b4 100644 (file)
--- a/mono/utils/memfuncs.c
+++ b/mono/utils/memfuncs.c
@@ -3,18 +3,7 @@
  *
  * Copyright (C) 2013-2015 Xamarin Inc
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License 2.0 as published by the Free Software Foundation;
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License 2.0 along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Licensed under the MIT license. See LICENSE file in the project root for full license information.
  */
 
 /*
@@ -188,7 +177,7 @@ mono_gc_memmove_aligned (void *dest, const void *src, size_t size)
                        while (p > align_end)
                                *--p = *--s;
 
-                       word_start = align_up (start);
+                       word_start = (char *)align_up (start);
                        bytes_to_memmove = p - word_start;
                        p -= bytes_to_memmove;
                        s -= bytes_to_memmove;