mirror of
https://github.com/php/php-src.git
synced 2025-08-19 17:04:47 +02:00
Merge branch 'PHP-5.6'
* PHP-5.6: avoid clash when stdint.h was included after win32/php_stdint.h
This commit is contained in:
commit
333f093010
1 changed files with 4 additions and 0 deletions
|
@ -36,6 +36,10 @@
|
||||||
#ifndef _MSC_STDINT_H_ // [
|
#ifndef _MSC_STDINT_H_ // [
|
||||||
#define _MSC_STDINT_H_
|
#define _MSC_STDINT_H_
|
||||||
|
|
||||||
|
#ifndef _STDINT
|
||||||
|
# define _STDINT
|
||||||
|
#endif
|
||||||
|
|
||||||
#if _MSC_VER > 1000
|
#if _MSC_VER > 1000
|
||||||
#pragma once
|
#pragma once
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue