Merge branch 'gcc' of https://github.com/alagoutte/nghttp2 into alagoutte-gcc

examples/libevent-server.c

@@ -688,7 +688,7 @@ static void start_listen(struct event_base *evbase, const char *service,
   hints.ai_flags = AI_PASSIVE;
 #ifdef AI_ADDRCONFIG
   hints.ai_flags |= AI_ADDRCONFIG;
-#endif // AI_ADDRCONFIG
+#endif /* AI_ADDRCONFIG */
 
   rv = getaddrinfo(NULL, service, &hints, &res);
   if(rv != 0) {

lib/nghttp2_hd.h

@@ -112,7 +112,7 @@ typedef enum {
   NGHTTP2_HD_STATE_CHECK_VALUELEN,
   NGHTTP2_HD_STATE_READ_VALUELEN,
   NGHTTP2_HD_STATE_READ_VALUEHUFF,
-  NGHTTP2_HD_STATE_READ_VALUE,
+  NGHTTP2_HD_STATE_READ_VALUE
 } nghttp2_hd_inflate_state;
 
 typedef struct {

lib/nghttp2_int.h

@@ -47,7 +47,7 @@ typedef enum {
   NGHTTP2_ERR_CREDENTIAL_PENDING = -101,
   NGHTTP2_ERR_BUFFER_ERROR = -102,
   NGHTTP2_ERR_IGN_HEADER_BLOCK = -103,
-  NGHTTP2_ERR_IGN_PAYLOAD = -104,
+  NGHTTP2_ERR_IGN_PAYLOAD = -104
 } nghttp2_internal_error;
 
 #endif /* NGHTTP2_INT_H */

lib/nghttp2_session.c

@@ -1612,8 +1612,8 @@ static int nghttp2_session_prep_frame(nghttp2_session *session,
         frame->hd.stream_id = session->next_stream_id;
         session->next_stream_id += 2;
 
-        // We first open strea with default priority.  This is because
-        // priority may be adjusted in callback.
+        /* We first open strea with default priority.  This is because
+        priority may be adjusted in callback. */
         nghttp2_priority_spec_default_init(&pri_spec_default);
 
         stream = nghttp2_session_open_stream

lib/nghttp2_stream.h

@@ -91,7 +91,7 @@ typedef enum {
   NGHTTP2_STREAM_FLAG_DEFERRED_USER = 0x08,
   /* bitwise OR of NGHTTP2_STREAM_FLAG_DEFERRED_FLOW_CONTROL and
      NGHTTP2_STREAM_FLAG_DEFERRED_USER. */
-  NGHTTP2_STREAM_FLAG_DEFERRED_ALL =  0x0c,
+  NGHTTP2_STREAM_FLAG_DEFERRED_ALL =  0x0c
 
 } nghttp2_stream_flag;