diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-02-16 18:03:41 +0100 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-02-16 18:03:41 +0100 |
| commit | 2ddce205350f11dacd8d8550f7d4e6e088c7fbcd (patch) | |
| tree | 26cb415aaacd70e8252646861ec070f6afde14f7 /bindings | |
| parent | 43620b3d35e3f3a6e49046fdc0426651bf58dedb (diff) | |
| parent | a2f9899f6a1fad3f9c73fc7599445bdde0b95ec4 (diff) | |
Merge branch 'master' of git@github.com:sustrik/zeromq2
Diffstat (limited to 'bindings')
| -rw-r--r-- | bindings/c/zmq.h | 1 | ||||
| -rw-r--r-- | bindings/java/Makefile.am | 13 |
2 files changed, 8 insertions, 6 deletions
diff --git a/bindings/c/zmq.h b/bindings/c/zmq.h index d5fb4f4..c6d4692 100644 --- a/bindings/c/zmq.h +++ b/bindings/c/zmq.h @@ -195,6 +195,7 @@ ZMQ_EXPORT int zmq_recv (void *s, zmq_msg_t *msg, int flags); #define ZMQ_POLLIN 1 #define ZMQ_POLLOUT 2 +#define ZMQ_POLLERR 4 typedef struct { diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am index 1ce32ac..e3d678f 100644 --- a/bindings/java/Makefile.am +++ b/bindings/java/Makefile.am @@ -17,19 +17,20 @@ dist_noinst_JAVA = \ lib_LTLIBRARIES = libjzmq.la libjzmq_la_SOURCES = \ Context.cpp \ - org_zmq_Context.h \ - Socket.cpp \ - org_zmq_Socket.h + Socket.cpp +nodist_libjzmq_la_SOURCES = \ + org_zmq_Context.h \ + org_zmq_Socket.h libjzmq_la_CXXFLAGS = @JAVA_INCLUDE@ -I$(top_srcdir)/bindings/c -Wall libjzmq_la_LDFLAGS = -version-info @JLTVER@ libjzmq_la_LIBADD = $(top_builddir)/src/libzmq.la BUILT_SOURCES = \ - org/zmq/Context.class \ - org_zmq_Context.h \ + org/zmq/Context.class \ + org_zmq_Context.h \ org/zmq/Socket.class \ - org_zmq_Socket.h + org_zmq_Socket.h CLEANFILES = \ org/zmq/Context.class \ |