altered header includes

git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@9 9efc2488-bf62-4759-914b-345cdb29e865

diff --git a/include/opensrf/generic_utils.h b/include/opensrf/generic_utils.h
index aa74221..22632a7 100644 (file)
--- a/include/opensrf/generic_utils.h
+++ b/include/opensrf/generic_utils.h
@@ -10,11 +10,6 @@
 #include <libxml/xpathInternals.h>
 #include <libxml/tree.h>
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
-
 #ifndef GENERIC_UTILS_H
 #define GENERIC_UTILS_H
 

diff --git a/include/opensrf/transport_client.h b/include/opensrf/transport_client.h
index 3d02add..5f16b2c 100644 (file)
--- a/include/opensrf/transport_client.h
+++ b/include/opensrf/transport_client.h
@@ -1,10 +1,6 @@
-#include "transport_session.h"
+#include "opensrf/transport_session.h"
 #include <time.h>
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 #ifndef TRANSPORT_CLIENT_H
 #define TRANSPORT_CLIENT_H
 

diff --git a/include/opensrf/transport_message.h b/include/opensrf/transport_message.h
index 21e3120..69b0560 100644 (file)
--- a/include/opensrf/transport_message.h
+++ b/include/opensrf/transport_message.h
@@ -1,6 +1,6 @@
 #include "libxml.h"
 
-#include "generic_utils.h"
+#include "opensrf/generic_utils.h"
 
 #include <string.h>
 #include <libxml/globals.h>
@@ -10,10 +10,6 @@
 #include <libxml/debugXML.h>
 #include <libxml/xmlmemory.h>
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 #ifndef TRANSPORT_MESSAGE_H
 #define TRANSPORT_MESSAGE_H
 

diff --git a/include/opensrf/transport_session.h b/include/opensrf/transport_session.h
index b78f20d..c2bef5d 100644 (file)
--- a/include/opensrf/transport_session.h
+++ b/include/opensrf/transport_session.h
@@ -4,9 +4,9 @@
 // logic ensues.
 // ---------------------------------------------------------------------------------
 #include "libxml.h"
-#include "transport_socket.h"
-#include "transport_message.h"
-#include "generic_utils.h"
+#include "opensrf/transport_socket.h"
+#include "opensrf/transport_message.h"
+#include "opensrf/generic_utils.h"
 
 #include <string.h>
 #include <libxml/globals.h>
@@ -30,10 +30,6 @@
 #define JABBER_JID_BUFSIZE                     64      
 #define JABBER_STATUS_BUFSIZE          16 
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 // ---------------------------------------------------------------------------------
 // Takes data from the socket handler and pushes it directly into the push parser
 // ---------------------------------------------------------------------------------

diff --git a/include/opensrf/transport_socket.h b/include/opensrf/transport_socket.h
index 65a83cc..a3e9d5f 100644 (file)
--- a/include/opensrf/transport_socket.h
+++ b/include/opensrf/transport_socket.h
@@ -1,4 +1,4 @@
-#include "generic_utils.h"
+#include "opensrf/generic_utils.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -26,10 +26,6 @@
 #include <netinet/in.h>
 #endif
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 #ifndef TRANSPORT_SOCKET_H
 #define TRANSPORT_SOCKET_H