From 025c9e173c58971993858ea66fb2eeaf08de195d Mon Sep 17 00:00:00 2001
From: Martin Sustrik <sustrik@250bpm.com>
Date: Tue, 23 Feb 2010 17:22:52 +0100
Subject: execution disabled on certain source files; some comments on java
 binding; MSVC temp files added to .gitignore

---
 .gitignore                         | 9 +++++++++
 bindings/java/Context.cpp          | 0
 bindings/java/Socket.cpp           | 0
 bindings/java/org/zmq/Context.java | 2 ++
 bindings/java/org/zmq/Socket.java  | 2 ++
 examples/chat/display.cpp          | 0
 6 files changed, 13 insertions(+)
 mode change 100755 => 100644 bindings/java/Context.cpp
 mode change 100755 => 100644 bindings/java/Socket.cpp
 mode change 100755 => 100644 bindings/java/org/zmq/Context.java
 mode change 100755 => 100644 bindings/java/org/zmq/Socket.java
 mode change 100755 => 100644 examples/chat/display.cpp

diff --git a/.gitignore b/.gitignore
index 9a09d34..a7412a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/bindings/java/Context.cpp b/bindings/java/Context.cpp
old mode 100755
new mode 100644
diff --git a/bindings/java/Socket.cpp b/bindings/java/Socket.cpp
old mode 100755
new mode 100644
diff --git a/bindings/java/org/zmq/Context.java b/bindings/java/org/zmq/Context.java
old mode 100755
new mode 100644
index 219b26c..1b5ecb4
--- a/bindings/java/org/zmq/Context.java
+++ b/bindings/java/org/zmq/Context.java
@@ -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.
      */
diff --git a/bindings/java/org/zmq/Socket.java b/bindings/java/org/zmq/Socket.java
old mode 100755
new mode 100644
index 1815b53..84e2c52
--- a/bindings/java/org/zmq/Socket.java
+++ b/bindings/java/org/zmq/Socket.java
@@ -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.
      */
diff --git a/examples/chat/display.cpp b/examples/chat/display.cpp
old mode 100755
new mode 100644
-- 
cgit v1.2.3