]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.3' into PHP-7.4
authorLevi Morrison <levi.morrison@datadoghq.com>
Fri, 8 Nov 2019 15:02:49 +0000 (08:02 -0700)
committerLevi Morrison <levi.morrison@datadoghq.com>
Fri, 8 Nov 2019 15:02:49 +0000 (08:02 -0700)
1  2 
ext/standard/hrtime.h
ext/standard/php_random.h

Simple merge
index 3398ddb5346559bd7aa31a69333464b876616776,dc92c86c67d433e9e2514a469841786fef4e9a9b..e61a80fa9ea9517c0f2e650aa1a4d4c1c053c6d3
@@@ -48,4 -50,13 +50,6 @@@ extern PHPAPI int random_globals_id
  extern PHPAPI php_random_globals random_globals;
  #endif
  
+ END_EXTERN_C()
  #endif
 -
 -/*
 - * Local variables:
 - * tab-width: 4
 - * c-basic-offset: 4
 - * End:
 - */