From 58b8e25a8075a4a5245ffb7fa727a7d33dd9dad1 Mon Sep 17 00:00:00 2001 From: erickson Date: Wed, 31 Aug 2005 21:14:35 +0000 Subject: [PATCH] all opensrf related headers are shoved into opensrf/*.h git-svn-id: svn://svn.open-ils.org/ILS/trunk@1787 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- OpenSRF/src/gateway/fieldmapper-c-xml-out.pl | 2 +- OpenSRF/src/jserver/jserver-c.h | 6 +++--- OpenSRF/src/jserver/jserver-c_session.h | 4 ++-- OpenSRF/src/libstack/osrfConfig.h | 4 ++-- OpenSRF/src/libstack/osrf_app_session.h | 3 +-- OpenSRF/src/libstack/osrf_message.h | 6 +++--- OpenSRF/src/libstack/osrf_prefork.h | 2 +- OpenSRF/src/libstack/osrf_settings.h | 4 ++-- OpenSRF/src/libstack/osrf_system.h | 5 ++--- OpenSRF/src/libtransport/transport_client.h | 4 ++-- OpenSRF/src/libtransport/transport_message.h | 4 ++-- OpenSRF/src/libtransport/transport_session.h | 6 +++--- OpenSRF/src/objson/json_parser.h | 2 +- OpenSRF/src/objson/object.h | 2 +- OpenSRF/src/router/router.h | 6 +++--- OpenSRF/src/utils/Makefile | 4 ++-- 16 files changed, 31 insertions(+), 33 deletions(-) diff --git a/OpenSRF/src/gateway/fieldmapper-c-xml-out.pl b/OpenSRF/src/gateway/fieldmapper-c-xml-out.pl index fa5829cca3..857a3fc7ed 100755 --- a/OpenSRF/src/gateway/fieldmapper-c-xml-out.pl +++ b/OpenSRF/src/gateway/fieldmapper-c-xml-out.pl @@ -44,7 +44,7 @@ print SOURCE < #include "objson/object.h" #include "objson/json_parser.h" -#include "utils.h" +#include "opensrf/utils.h" char* json_string_to_xml(char*); void _rest_xml_output(growing_buffer*, object*, char*, int, int); diff --git a/OpenSRF/src/jserver/jserver-c.h b/OpenSRF/src/jserver/jserver-c.h index d215a124ba..498df0acd1 100644 --- a/OpenSRF/src/jserver/jserver-c.h +++ b/OpenSRF/src/jserver/jserver-c.h @@ -1,6 +1,6 @@ -#include "utils.h" -#include "logging.h" -#include "socket_bundle.h" +#include "opensrf/utils.h" +#include "opensrf/logging.h" +#include "opensrf/socket_bundle.h" #include "jserver-c_session.h" #include "jstrings.h" diff --git a/OpenSRF/src/jserver/jserver-c_session.h b/OpenSRF/src/jserver/jserver-c_session.h index d90b048310..d8e72290b6 100644 --- a/OpenSRF/src/jserver/jserver-c_session.h +++ b/OpenSRF/src/jserver/jserver-c_session.h @@ -1,7 +1,7 @@ #define _GNU_SOURCE -#include "utils.h" -#include "logging.h" +#include "opensrf/utils.h" +#include "opensrf/logging.h" #include "jstrings.h" diff --git a/OpenSRF/src/libstack/osrfConfig.h b/OpenSRF/src/libstack/osrfConfig.h index 0d184fe518..c0a6459b42 100644 --- a/OpenSRF/src/libstack/osrfConfig.h +++ b/OpenSRF/src/libstack/osrfConfig.h @@ -17,8 +17,8 @@ GNU General Public License for more details. #define _OSRF_CONFIG_H #include "xml_utils.h" -#include "utils.h" -#include "string_array.h" +#include "opensrf/utils.h" +#include "opensrf/string_array.h" #include "objson/object.h" typedef struct { diff --git a/OpenSRF/src/libstack/osrf_app_session.h b/OpenSRF/src/libstack/osrf_app_session.h index 6d8626b619..50d283a55f 100644 --- a/OpenSRF/src/libstack/osrf_app_session.h +++ b/OpenSRF/src/libstack/osrf_app_session.h @@ -4,8 +4,7 @@ #include "opensrf/transport_client.h" #include "osrf_message.h" #include "osrf_system.h" -#include "string_array.h" -//#include "osrf_config.h" +#include "opensrf/string_array.h" #include "osrfConfig.h" #include "objson/object.h" diff --git a/OpenSRF/src/libstack/osrf_message.h b/OpenSRF/src/libstack/osrf_message.h index 637c8b10c3..42df49a5fb 100644 --- a/OpenSRF/src/libstack/osrf_message.h +++ b/OpenSRF/src/libstack/osrf_message.h @@ -1,6 +1,6 @@ -#include "string_array.h" -#include "utils.h" -#include "logging.h" +#include "opensrf/string_array.h" +#include "opensrf/utils.h" +#include "opensrf/logging.h" #include "objson/object.h" #include "objson/json_parser.h" diff --git a/OpenSRF/src/libstack/osrf_prefork.h b/OpenSRF/src/libstack/osrf_prefork.h index c1c35de356..a2dfdb83d7 100644 --- a/OpenSRF/src/libstack/osrf_prefork.h +++ b/OpenSRF/src/libstack/osrf_prefork.h @@ -7,7 +7,7 @@ #include #include -#include "utils.h" +#include "opensrf/utils.h" #include "opensrf/transport_message.h" #include "osrf_stack.h" #include "osrf_settings.h" diff --git a/OpenSRF/src/libstack/osrf_settings.h b/OpenSRF/src/libstack/osrf_settings.h index f8d5d3109d..7241b49138 100644 --- a/OpenSRF/src/libstack/osrf_settings.h +++ b/OpenSRF/src/libstack/osrf_settings.h @@ -8,8 +8,8 @@ #include #include -#include "logging.h" -#include "utils.h" +#include "opensrf/logging.h" +#include "opensrf/utils.h" #include "objson/object.h" #include "objson/json_parser.h" #include "osrf_app_session.h" diff --git a/OpenSRF/src/libstack/osrf_system.h b/OpenSRF/src/libstack/osrf_system.h index 0b9b262dde..414b7d31da 100644 --- a/OpenSRF/src/libstack/osrf_system.h +++ b/OpenSRF/src/libstack/osrf_system.h @@ -2,9 +2,8 @@ #define OSRF_SYSTEM_H #include "opensrf/transport_client.h" -#include "utils.h" -#include "logging.h" -//#include "osrf_config.h" +#include "opensrf/utils.h" +#include "opensrf/logging.h" #include "osrf_settings.h" #include "osrfConfig.h" diff --git a/OpenSRF/src/libtransport/transport_client.h b/OpenSRF/src/libtransport/transport_client.h index 318d3bf001..530285d096 100644 --- a/OpenSRF/src/libtransport/transport_client.h +++ b/OpenSRF/src/libtransport/transport_client.h @@ -1,6 +1,6 @@ #include "transport_session.h" -#include "utils.h" -#include "logging.h" +#include "opensrf/utils.h" +#include "opensrf/logging.h" #include diff --git a/OpenSRF/src/libtransport/transport_message.h b/OpenSRF/src/libtransport/transport_message.h index a0dc7ff63c..6cc485b998 100644 --- a/OpenSRF/src/libtransport/transport_message.h +++ b/OpenSRF/src/libtransport/transport_message.h @@ -6,8 +6,8 @@ #include #include -#include "utils.h" -#include "logging.h" +#include "opensrf/utils.h" +#include "opensrf/logging.h" #ifndef TRANSPORT_MESSAGE_H #define TRANSPORT_MESSAGE_H diff --git a/OpenSRF/src/libtransport/transport_session.h b/OpenSRF/src/libtransport/transport_session.h index 27199e8ab1..9701cbeb00 100644 --- a/OpenSRF/src/libtransport/transport_session.h +++ b/OpenSRF/src/libtransport/transport_session.h @@ -5,9 +5,9 @@ // --------------------------------------------------------------------------------- #include "transport_message.h" -#include "utils.h" -#include "logging.h" -#include "socket_bundle.h" +#include "opensrf/utils.h" +#include "opensrf/logging.h" +#include "opensrf/socket_bundle.h" #include "sha.h" diff --git a/OpenSRF/src/objson/json_parser.h b/OpenSRF/src/objson/json_parser.h index e47a429bdf..6beec62dcc 100644 --- a/OpenSRF/src/objson/json_parser.h +++ b/OpenSRF/src/objson/json_parser.h @@ -24,7 +24,7 @@ GNU General Public License for more details. #include #include "object.h" -#include "utils.h" +#include "opensrf/utils.h" diff --git a/OpenSRF/src/objson/object.h b/OpenSRF/src/objson/object.h index 64168b9fce..41a2ccfe7a 100644 --- a/OpenSRF/src/objson/object.h +++ b/OpenSRF/src/objson/object.h @@ -26,7 +26,7 @@ GNU General Public License for more details. #include #include -#include "utils.h" +#include "opensrf/utils.h" /* json object types */ #define JSON_HASH 0 diff --git a/OpenSRF/src/router/router.h b/OpenSRF/src/router/router.h index f12339692e..8690835423 100644 --- a/OpenSRF/src/router/router.h +++ b/OpenSRF/src/router/router.h @@ -2,9 +2,9 @@ #include "opensrf/transport_message.h" #include "opensrf/osrf_message.h" -#include "utils.h" -#include "logging.h" -#include "osrfConfig.h" +#include "opensrf/utils.h" +#include "opensrf/logging.h" +#include "opensrf/osrfConfig.h" #include #include diff --git a/OpenSRF/src/utils/Makefile b/OpenSRF/src/utils/Makefile index f0e4c280b0..443336431d 100644 --- a/OpenSRF/src/utils/Makefile +++ b/OpenSRF/src/utils/Makefile @@ -16,8 +16,8 @@ msg: install: echo installing libc_utils.so - cp $(UTIL_HEADERS) $(INCLUDEDIR)/ - cp xml_utils.h $(INCLUDEDIR)/ + cp $(UTIL_HEADERS) $(INCLUDEDIR)/$(OPENSRF)/ + cp xml_utils.h $(INCLUDEDIR)/$(OPENSRF)/ cp $(TMPDIR)/libc_utils.so $(LIBDIR)/ libc_utils.so: $(UTIL_OBJECTS) -- 2.43.2