Commit 025c9e17 authored by Martin Sustrik's avatar Martin Sustrik

execution disabled on certain source files; some comments on java binding; MSVC…

execution disabled on certain source files; some comments on java binding; MSVC temp files added to .gitignore
parent 71b4947f
...@@ -9,6 +9,8 @@ config.log ...@@ -9,6 +9,8 @@ config.log
aclocal.m4 aclocal.m4
autom4te.cache autom4te.cache
*.o *.o
*.class
*.ncb
*.lo *.lo
*.loT *.loT
*.la *.la
...@@ -16,6 +18,8 @@ autom4te.cache ...@@ -16,6 +18,8 @@ autom4te.cache
*.pdf *.pdf
*.ps *.ps
.* .*
*~
.*~
src/platform.hpp* src/platform.hpp*
src/stamp-h1 src/stamp-h1
devices/zmq_forwarder/zmq_forwarder devices/zmq_forwarder/zmq_forwarder
...@@ -37,6 +41,11 @@ doc/*.7 ...@@ -37,6 +41,11 @@ doc/*.7
doc/*.html doc/*.html
doc/*.xml doc/*.xml
bindings/python/setup.py bindings/python/setup.py
bindings/java/org_zmq_*.h
src/libzmq.pc src/libzmq.pc
lib/
builds/msvc/*/*.user
builds/msvc/*/Debug
builds/msvc/*/Release
foreign/openpgm/* foreign/openpgm/*
!foreign/openpgm/*.tar.bz2 !foreign/openpgm/*.tar.bz2
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
...@@ -44,6 +44,8 @@ public class Context { ...@@ -44,6 +44,8 @@ public class Context {
/** /**
* Get the underlying context handle. * Get the underlying context handle.
* This is private because it is only accessed from JNI, where
* Java access controls are ignored.
* *
* @return the internal 0MQ context handle. * @return the internal 0MQ context handle.
*/ */
......
...@@ -121,6 +121,8 @@ public class Socket { ...@@ -121,6 +121,8 @@ public class Socket {
/** /**
* Get the underlying socket handle. * Get the underlying socket handle.
* This is private because it is only accessed from JNI, where
* Java access controls are ignored.
* *
* @return the internal 0MQ socket handle. * @return the internal 0MQ socket handle.
*/ */
......
File mode changed from 100755 to 100644
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