Bump MHD_VERSION, update ChangeLog, substitute MHD_create_response_from_fd_at_offset64() instead of MHD_create_response_from_fd_at_offset()

3 files changed, 12 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index e8aa7c9a..13e5845c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jun 09 18:30:17 CEST 2015
+        Add new functions MHD_create_response_from_fd64() and
+        MHD_create_response_from_fd_at_offset64(). -EG
+
 Thu Jun  4 13:37:05 CEST 2015
         Fixing memory leak in digest authentication. -AW
 
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index 995974a9..2269ec1a 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -130,7 +130,7 @@ typedef intptr_t ssize_t;
  * Current version of the library.
  * 0x01093001 = 1.9.30-1.
  */
-#define MHD_VERSION 0x00094202
+#define MHD_VERSION 0x00094203
 
 /**
  * MHD-internal return code for "YES".
@@ -2121,6 +2121,12 @@ MHD_create_response_from_fd_at_offset (size_t size,
                                        int fd,
                                        off_t offset);
 
+/* Substitute MHD_create_response_from_fd_at_offset64() instead of MHD_create_response_from_fd_at_offset() 
+   to minimize possible problems with different off_t options */
+#define MHD_create_response_from_fd_at_offset(size,fd,offset) \
+  _MHD_DEPR_MACRO("Usage of MHD_create_response_from_fd_at_offset() is deprecated, use MHD_create_response_from_fd_at_offset64()") \
+  MHD_create_response_from_fd_at_offset64((size),(fd),(offset))
+
 
 /**
  * Create a response object.  The response object can be extended with
diff --git a/src/microhttpd/response.c b/src/microhttpd/response.c
index 5d68828d..cff5e5dc 100644
--- a/src/microhttpd/response.c
+++ b/src/microhttpd/response.c
@@ -378,6 +378,7 @@ free_callback (void *cls)
   response->fd = -1;
 }
 
+#undef MHD_create_response_from_fd_at_offset
 
 /**
  * Create a response object.  The response object can be extended with