Merge trunk up to current neon CVS HEAD.

git-svn-id: http://svn.webdav.org/repos/projects/neon/trunk@256 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845

1 files changed, 0 insertions, 14 deletions

diff --git a/src/ne_basic.h b/src/ne_basic.h
index 1953fc2..f9b5157 100644
--- a/src/ne_basic.h
+++ b/src/ne_basic.h
@@ -36,13 +36,10 @@ int ne_get(ne_session *sess, const char *path, int fd);
  * body to submit from 'fd'. */
 int ne_put(ne_session *sess, const char *path, int fd);
 
-#ifndef NEON_NODAV
-
 #define NE_DEPTH_ZERO (0)
 #define NE_DEPTH_ONE (1)
 #define NE_DEPTH_INFINITE (2)
 
-
 /* For ne_copy and ne_move:
  * 
  * If a resource exists at "dest" and overwrite is zero, the operation
@@ -70,17 +67,6 @@ int ne_mkcol(ne_session *sess, const char *path);
 /* Adds a Depth: header to a request */
 void ne_add_depth_header(ne_request *req, int depth);
 
-#endif /* NEON_NODAV */
-
-/* PUT resource at location as above, only if it has not been modified
- * since given modtime. If server is HTTP/1.1, uses If-Unmodified-Since
- * header; guaranteed failure if resource is modified after 'modtime'.
- * If server is HTTP/1.0, HEAD's the resource first to fetch current
- * modtime; race condition if resource is modified between HEAD and PUT.
- */
-int ne_put_if_unmodified(ne_session *sess,
-			 const char *path, int fd, time_t modtime);
-
 /* Retrieve modification time of resource at location 'path', place in
  * *modtime.  (uses HEAD) */
 int ne_getmodtime(ne_session *sess, const char *path, time_t *modtime);