projects
/
yaz-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4d1fabb
)
Fix compilation without Libxml2 YAZ-755 revisited
author
Adam Dickmeiss
<adam@indexdata.dk>
Wed, 30 Apr 2014 13:56:44 +0000
(15:56 +0200)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Wed, 30 Apr 2014 13:56:44 +0000
(15:56 +0200)
src/zoom-c.c
patch
|
blob
|
history
diff --git
a/src/zoom-c.c
b/src/zoom-c.c
index
b7bb1fe
..
f97123d
100644
(file)
--- a/
src/zoom-c.c
+++ b/
src/zoom-c.c
@@
-1501,7
+1501,6
@@
ZOOM_API(int)
return 1;
}
return 1;
}
-#if YAZ_HAVE_XML2
static zoom_ret send_HTTP_redirect(ZOOM_connection c, const char *uri)
{
static zoom_ret send_HTTP_redirect(ZOOM_connection c, const char *uri)
{
@@
-1521,6
+1520,7
@@
static zoom_ret send_HTTP_redirect(ZOOM_connection c, const char *uri)
return ZOOM_send_GDU(c, gdu);
}
return ZOOM_send_GDU(c, gdu);
}
+
zoom_ret ZOOM_send_GDU(ZOOM_connection c, Z_GDU *gdu)
{
ZOOM_Event event;
zoom_ret ZOOM_send_GDU(ZOOM_connection c, Z_GDU *gdu)
{
ZOOM_Event event;
@@
-1541,15
+1541,13
@@
zoom_ret ZOOM_send_GDU(ZOOM_connection c, Z_GDU *gdu)
return ZOOM_send_buf(c);
}
return ZOOM_send_buf(c);
}
-#if YAZ_HAVE_XML2
void ZOOM_set_HTTP_error(ZOOM_connection c, int error,
const char *addinfo, const char *addinfo2)
{
ZOOM_set_dset_error(c, error, "HTTP", addinfo, addinfo2);
}
void ZOOM_set_HTTP_error(ZOOM_connection c, int error,
const char *addinfo, const char *addinfo2)
{
ZOOM_set_dset_error(c, error, "HTTP", addinfo, addinfo2);
}
-#endif
-
+#if YAZ_HAVE_XML2
static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres)
{
zoom_ret cret = zoom_complete;
static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres)
{
zoom_ret cret = zoom_complete;