From: Anatol Belski <ab@php.net>
Date: Wed, 20 Aug 2014 16:44:43 +0000 (-0700)
Subject: fixed sysvshm
X-Git-Tag: POST_64BIT_BRANCH_MERGE^2~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49b65d0d65325518098139795697cf98c377e661;p=php

fixed sysvshm
---

diff --git a/ext/sysvshm/php_sysvshm.h b/ext/sysvshm/php_sysvshm.h
index dad18adcf1..359c9f7ae2 100644
--- a/ext/sysvshm/php_sysvshm.h
+++ b/ext/sysvshm/php_sysvshm.h
@@ -46,10 +46,10 @@ typedef struct {
 
 typedef struct {
 	char magic[8];
-	long start;
-	long end;
-	long free;
-	long total;
+	php_int_t start;
+	php_int_t end;
+	php_int_t free;
+	php_int_t total;
 } sysvshm_chunk_head;
 
 typedef struct {
diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c
index 4b97a8769b..97fa4df8d7 100644
--- a/ext/sysvshm/sysvshm.c
+++ b/ext/sysvshm/sysvshm.c
@@ -346,7 +346,7 @@ PHP_FUNCTION(shm_remove_var)
 	shm_varpos = php_check_shm_data((shm_list_ptr->ptr), shm_key);
 
 	if (shm_varpos < 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "variable key %id doesn't exist", shm_key);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "variable key %pd doesn't exist", shm_key);
 		RETURN_FALSE;
 	}
 	php_remove_shm_data((shm_list_ptr->ptr), shm_varpos);