From 8149ac7d7abcfc3fadf289946f9aeb137efe199e Mon Sep 17 00:00:00 2001
From: John Barboza <jbarboza@ca.ibm.com>
Date: Fri, 11 May 2018 06:10:50 -0700
Subject: [PATCH] zos: set language level to extended c99

PR-URL: https://github.com/libuv/libuv/pull/1839
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
---
 common.gypi   | 6 +++++-
 test/test.gyp | 8 --------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/common.gypi b/common.gypi
index 572a1633..8aeb7be4 100644
--- a/common.gypi
+++ b/common.gypi
@@ -158,7 +158,7 @@
             'cflags': [ '-pthreads' ],
             'ldflags': [ '-pthreads' ],
           }],
-          [ 'OS not in "solaris android zos"', {
+          [ 'OS not in "solaris android"', {
             'cflags': [ '-pthread' ],
             'ldflags': [ '-pthread' ],
           }],
@@ -203,6 +203,10 @@
        # pull in V8's postmortem metadata
        'ldflags': [ '-Wl,-z,allextract' ]
      }],
+     ['OS=="zos"', {
+       'cflags': [ '-qlanglvl=extc99', '-qxplink' ],
+       'ldflags': [ '-qxplink' ],
+     }],
     ],
   },
 }
diff --git a/test/test.gyp b/test/test.gyp
index 30310482..7ac1fa26 100644
--- a/test/test.gyp
+++ b/test/test.gyp
@@ -190,10 +190,6 @@
             '_XOPEN_SOURCE=500',
           ],
         }],
-        [ 'OS == "zos"', {
-          'cflags': [ '-qxplink' ],
-          'ldflags': [ '-qxplink' ],
-        }],
         ['uv_library=="shared_library"', {
           'defines': [ 'USING_UV_SHARED=1' ],
           'conditions': [
@@ -254,10 +250,6 @@
             'runner-unix.h',
           ]
         }],
-        [ 'OS == "zos"', {
-          'cflags': [ '-qxplink' ],
-          'ldflags': [ '-qxplink' ],
-        }],
         ['uv_library=="shared_library"', {
           'defines': [ 'USING_UV_SHARED=1' ],
           'conditions': [