diff --git a/ext/mbstring/mbregex.c b/ext/mbstring/mbregex.c
index 64dd8f20fa9..ee8966283f6 100644
--- a/ext/mbstring/mbregex.c
+++ b/ext/mbstring/mbregex.c
@@ -647,7 +647,7 @@ print_mbc(c)
 /* Make sure we have at least N more bytes of space in buffer.  */
 #define GET_BUFFER_SPACE(n)						\
   do {								        \
-    while (b - bufp->buffer + (n) >= bufp->allocated)			\
+    while (b - bufp->buffer + (size_t)(n) >= (size_t)bufp->allocated)			\
       EXTEND_BUFFER;							\
   } while (0)
 
@@ -2401,7 +2401,7 @@ re_compile_pattern(pattern, size, bufp)
 	  GET_UNSIGNED_NUMBER(c1);
 	  if (!ISDIGIT(c)) PATUNFETCH;
 
-	if (9 < c1 && c1 >= regnum) {
+	if (9 < c1 && c1 >= (unsigned int)regnum) {
 	    /* need to get octal */
 	  c = scan_oct(p0, 3, &numlen) & 0xff;
 	  p = p0 + numlen;
@@ -3881,7 +3881,7 @@ re_match(bufp, string_arg, size, pos, regs)
 	  register unsigned char *d2, *dend2;
 
 	  /* Check if there's corresponding group */
-	  if (regno >= num_regs) goto fail;
+	  if (regno >= (int)num_regs) goto fail;
 	  /* Check if corresponding group is still open */
 	  if (IS_ACTIVE(reg_info[regno])) goto fail;
 
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index cf4e7f2bc99..3edc56cbf30 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -138,7 +138,7 @@ static const unsigned char second_args_force_ref[]    = { 2, BYREF_NONE, BYREF_F
 static const unsigned char third_argument_force_ref[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE };
 #endif
 
-static const sapi_post_entry mbstr_post_entries[] = {
+static sapi_post_entry mbstr_post_entries[] = {
 	{ DEFAULT_POST_CONTENT_TYPE, sizeof(DEFAULT_POST_CONTENT_TYPE)-1, sapi_read_standard_form_data, php_mbstr_post_handler },
 	{ MULTIPART_CONTENT_TYPE,    sizeof(MULTIPART_CONTENT_TYPE)-1,    NULL,                         rfc1867_post_handler },
 	{ NULL, 0, NULL, NULL }
@@ -3371,7 +3371,7 @@ PHP_FUNCTION(mb_get_info)
 }
 /* }}} */
 
-PHPAPI int mbstr_encoding_translation(TSRMLS_D)
+PHPAPI int mbstr_encoding_translation(TSRMLS_D) 
 {
 	return MBSTRG(encoding_translation);
 }