Skip to content

Instantly share code, notes, and snippets.

@motoishmz
Created July 27, 2015 18:00
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save motoishmz/bbefe2400e7882ba9169 to your computer and use it in GitHub Desktop.
Save motoishmz/bbefe2400e7882ba9169 to your computer and use it in GitHub Desktop.
今日教えてもらった奴のdiff: $ patch -p0 < ofxZmq_diff.patch
diff --git a/libs/zmq/src/config.hpp b/libs/zmq/src/config.hpp
index 6e5ef5a..5c1e6c8 100644
--- a/libs/zmq/src/config.hpp
+++ b/libs/zmq/src/config.hpp
@@ -20,6 +20,8 @@
#ifndef __ZMQ_CONFIG_HPP_INCLUDED__
#define __ZMQ_CONFIG_HPP_INCLUDED__
+#undef check
+
namespace zmq
{
diff --git a/libs/zmq/src/socket_base.cpp b/libs/zmq/src/socket_base.cpp
index a1b1ec0..8696cb9 100644
--- a/libs/zmq/src/socket_base.cpp
+++ b/libs/zmq/src/socket_base.cpp
@@ -17,6 +17,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#undef check
+
#include <new>
#include <string>
#include <algorithm>
diff --git a/libs/zmq/src/trie.hpp b/libs/zmq/src/trie.hpp
index 43ae1de..2389d1e 100644
--- a/libs/zmq/src/trie.hpp
+++ b/libs/zmq/src/trie.hpp
@@ -24,6 +24,8 @@
#include "stdint.hpp"
+#undef check
+
namespace zmq
{
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment