Skip to content

L
libzmq
Commit 8d544ef1 authored by Luca Boccassi's avatar Luca Boccassi
Browse files
Options

Problem: formatting issues in the CI 

Solution: commit clang-format-diff
parent fef99d6c
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
src/tweetnacl.c
View file @ 8d544ef1
...@@ -32,16 +32,18 @@ ...@@ -32,16 +32,18 @@
*/ */
#include "platform.hpp" #include "platform.hpp"
#if defined (ZMQ_USE_TWEETNACL) #if defined(ZMQ_USE_TWEETNACL)
/* /*
Disable warnings for this source only, rather than for the whole Disable warnings for this source only, rather than for the whole
codebase when building with C99 (gcc >= 4.2) or with Microsoft's compiler codebase when building with C99 (gcc >= 4.2) or with Microsoft's compiler
*/ */
#if defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) && __STDC_VERSION__ < 201112L #if defined __GNUC__ \
# pragma GCC diagnostic ignored "-Wsign-compare" && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) \
&& __STDC_VERSION__ < 201112L
#pragma GCC diagnostic ignored "-Wsign-compare"
#elif defined _MSC_VER #elif defined _MSC_VER
# pragma warning (disable:4018 4244 4146) #pragma warning(disable : 4018 4244 4146)
#endif #endif
// clang-format off // clang-format off
......
src/zmq.cpp
View file @ 8d544ef1
...@@ -685,7 +685,7 @@ const char *zmq_msg_gets (const zmq_msg_t *msg_, const char *property_) ...@@ -685,7 +685,7 @@ const char *zmq_msg_gets (const zmq_msg_t *msg_, const char *property_)
} }
} }
// Polling. // Polling.
#if defined ZMQ_HAVE_POLLER #if defined ZMQ_HAVE_POLLER
inline int zmq_poller_poll (zmq_pollitem_t *items_, int nitems_, long timeout_) inline int zmq_poller_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment