From e89a078f8ad27ff964fe426fa96f1d4c4a594d7b Mon Sep 17 00:00:00 2001
From: joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845>
Date: Mon, 30 Sep 2013 15:45:36 +0000
Subject: Merge 1933,1935 from trunk:

* doc/ref/reqbody.xml: Doc fixes.

* macros/neon-test.m4 (NEON_TEST): Check for signal.h.



git-svn-id: http://svn.webdav.org/repos/projects/neon/branches/0.30.x@1936 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845
---
 doc/ref/reqbody.xml | 5 ++---
 macros/neon-test.m4 | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/doc/ref/reqbody.xml b/doc/ref/reqbody.xml
index 9249c31..a724cf5 100644
--- a/doc/ref/reqbody.xml
+++ b/doc/ref/reqbody.xml
@@ -8,7 +8,6 @@
       <refnamediv>
 	<refname id="ne_set_request_body_buffer">ne_set_request_body_buffer</refname>
 	<refname id="ne_set_request_body_fd">ne_set_request_body_fd</refname>
-	<refname id="ne_set_request_body_fd64">ne_set_request_body_fd64</refname>
 	<refpurpose>include a message body with a request</refpurpose>
       </refnamediv>
       
@@ -29,8 +28,8 @@
 	    <funcdef>int <function>ne_set_request_body_fd</function></funcdef>
 	    <paramdef>ne_request *<parameter>req</parameter></paramdef>
 	    <paramdef>int <parameter>fd</parameter></paramdef>
-	    <paramdef>off_t <parameter>begin</parameter></paramdef>
-	    <paramdef>off_t <parameter>length</parameter></paramdef>
+	    <paramdef>ne_off_t <parameter>begin</parameter></paramdef>
+	    <paramdef>ne_off_t <parameter>length</parameter></paramdef>
 	  </funcprototype>
 
 	</funcsynopsis>
diff --git a/macros/neon-test.m4 b/macros/neon-test.m4
index c4e3095..3abd406 100644
--- a/macros/neon-test.m4
+++ b/macros/neon-test.m4
@@ -37,7 +37,7 @@ dnl CPPFLAGS which make "gcc -Werror" fail in NEON_FORMAT; suggest
 dnl this macro is used first.
 AC_BEFORE([$0], [NEON_XML_PARSER])
 
-AC_CHECK_HEADERS(sys/time.h stdint.h locale.h)
+AC_CHECK_HEADERS(sys/time.h signal.h stdint.h locale.h)
 
 AC_CHECK_FUNCS(pipe isatty usleep shutdown setlocale gethostname)
 
-- 
cgit v1.2.1