execution disabled on certain source files; some comments on java binding; MSVC temp files added to .gitignore

This commit is contained in:
Martin Sustrik 2010-02-23 17:22:52 +01:00
parent 71b4947f95
commit 025c9e173c
6 changed files with 13 additions and 0 deletions

9
.gitignore vendored
View File

@ -9,6 +9,8 @@ config.log
aclocal.m4
autom4te.cache
*.o
*.class
*.ncb
*.lo
*.loT
*.la
@ -16,6 +18,8 @@ autom4te.cache
*.pdf
*.ps
.*
*~
.*~
src/platform.hpp*
src/stamp-h1
devices/zmq_forwarder/zmq_forwarder
@ -37,6 +41,11 @@ doc/*.7
doc/*.html
doc/*.xml
bindings/python/setup.py
bindings/java/org_zmq_*.h
src/libzmq.pc
lib/
builds/msvc/*/*.user
builds/msvc/*/Debug
builds/msvc/*/Release
foreign/openpgm/*
!foreign/openpgm/*.tar.bz2

0
bindings/java/Context.cpp Executable file → Normal file
View File

0
bindings/java/Socket.cpp Executable file → Normal file
View File

2
bindings/java/org/zmq/Context.java Executable file → Normal file
View File

@ -44,6 +44,8 @@ public class Context {
/**
* 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.
*/

2
bindings/java/org/zmq/Socket.java Executable file → Normal file
View File

@ -121,6 +121,8 @@ public class Socket {
/**
* 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.
*/

0
examples/chat/display.cpp Executable file → Normal file
View File