From: Levi Morrison <levi.morrison@datadoghq.com>
Date: Fri, 8 Nov 2019 15:02:49 +0000 (-0700)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.7RC1~513
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=05bce66037c8994727dbeef888e0ceb57937aa97;p=php

Merge branch 'PHP-7.3' into PHP-7.4
---

05bce66037c8994727dbeef888e0ceb57937aa97
diff --cc ext/standard/php_random.h
index 3398ddb534,dc92c86c67..e61a80fa9e
--- a/ext/standard/php_random.h
+++ b/ext/standard/php_random.h
@@@ -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:
 - */