Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
c5eada8e
Unverified
Commit
c5eada8e
authored
Jan 31, 2020
by
Luca Santarella
Committed by
GitHub
Jan 31, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactored ulong to zend_ulong for php7.4 compatibility (#7147)
parent
85219578
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
protobuf.h
php/ext/google/protobuf/protobuf.h
+4
-4
No files found.
php/ext/google/protobuf/protobuf.h
View file @
c5eada8e
...
...
@@ -292,7 +292,7 @@
#define PHP_PROTO_HASH_OF(array) Z_ARRVAL_P(&array)
static
inline
int
php_proto_zend_hash_index_update_zval
(
HashTable
*
ht
,
ulong
h
,
static
inline
int
php_proto_zend_hash_index_update_zval
(
HashTable
*
ht
,
zend_
ulong
h
,
zval
*
pData
)
{
void
*
result
=
NULL
;
result
=
zend_hash_index_update
(
ht
,
h
,
pData
);
...
...
@@ -308,7 +308,7 @@ static inline int php_proto_zend_hash_update(HashTable* ht, const char* key,
return
result
!=
NULL
?
SUCCESS
:
FAILURE
;
}
static
inline
int
php_proto_zend_hash_index_update_mem
(
HashTable
*
ht
,
ulong
h
,
static
inline
int
php_proto_zend_hash_index_update_mem
(
HashTable
*
ht
,
zend_
ulong
h
,
void
*
pData
,
uint
nDataSize
,
void
**
pDest
)
{
void
*
result
=
NULL
;
...
...
@@ -337,7 +337,7 @@ static inline int php_proto_zend_hash_update_mem(HashTable* ht, const char* key,
}
static
inline
int
php_proto_zend_hash_index_find_zval
(
const
HashTable
*
ht
,
ulong
h
,
void
**
pDest
)
{
zend_
ulong
h
,
void
**
pDest
)
{
zval
*
result
=
zend_hash_index_find
(
ht
,
h
);
if
(
pDest
!=
NULL
)
*
pDest
=
result
;
return
result
!=
NULL
?
SUCCESS
:
FAILURE
;
...
...
@@ -351,7 +351,7 @@ static inline int php_proto_zend_hash_find(const HashTable* ht, const char* key,
}
static
inline
int
php_proto_zend_hash_index_find_mem
(
const
HashTable
*
ht
,
ulong
h
,
void
**
pDest
)
{
zend_
ulong
h
,
void
**
pDest
)
{
void
*
result
=
NULL
;
result
=
zend_hash_index_find_ptr
(
ht
,
h
);
if
(
pDest
!=
NULL
)
*
pDest
=
result
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment