file renames to avoid conflicts

oc/Makefile.am

@@ -11,15 +11,16 @@
 AM_CPPFLAGS =  -I$(top_srcdir) -I$(top_srcdir)/include
 
 # OC Sources; include the daptab.[ch] to avoid the need for bison by user
-SRC= curlfunctions.c dapparse.c daplex.c ocuri.c http.c ocbytes.c	\
+SRC= occurlfunctions.c dapparse.c daplex.c ocuri.c ochttp.c ocbytes.c	\
 oc.c occontent.c ocdebug.c ocdrno.c ocdump.c	\
 ocinternal.c oclist.c oclog.c ocnode.c ocutil.c occlientparams.c	\
-rc.c read.c xxdr.c daptab.c
+ocrc.c ocread.c xxdr.c daptab.c
 
-HDRS= curlfunctions.h constraints.h dapparselex.h ocuri.h http.h ocbytes.h \
-occontent.h ocdata.h ocdatatypes.h ocdebug.h ocdrno.h ocdump.h oc.h	\
-ocinternal.h oclist.h oclog.h ocnode.h occlientparams.h ocutil.h rc.h	\
-read.h xxdr.h daptab.h
+HDRS= occurlfunctions.h occonstraints.h dapparselex.h ocuri.h ochttp.h \
+ocbytes.h occontent.h ocdata.h ocdatatypes.h ocdebug.h ocdrno.h ocdump.h \
+ocinternal.h oclist.h oclog.h ocnode.h occlientparams.h ocutil.h ocrc.h	\
+ocread.h xxdr.h daptab.h \
+oc.h
 
 if BUILD_DAP
 noinst_LTLIBRARIES = liboc.la

oc/occurlfunctions.c

@@ -7,7 +7,7 @@
 #include "ocdata.h"
 #include "occontent.h"
 
-#include "rc.h"
+#include "ocrc.h"
 
 /* Condition on libcurl version */
 /* Set up an alias as needed */

oc/ochttp.c

@@ -9,8 +9,8 @@
 #include <fcntl.h>
 #include "ocinternal.h"
 #include "ocdebug.h"
-#include "http.h"
-#include "rc.h"
+#include "ochttp.h"
+#include "ocrc.h"
 
 static size_t WriteFileCallback(void*, size_t, size_t, void*);
 static size_t WriteMemoryCallback(void*, size_t, size_t, void*);

oc/ocinternal.c

@@ -15,11 +15,11 @@
 #include "ocdata.h"
 #include "occontent.h"
 #include "occlientparams.h"
-#include "rc.h"
-#include "curlfunctions.h"
+#include "ocrc.h"
+#include "occurlfunctions.h"
 
-#include "http.h"
-#include "read.h"
+#include "ochttp.h"
+#include "ocread.h"
 
 /* Note: TMPPATH must end in '/' */
 #ifdef __CYGWIN__

oc/ocinternal.h

@@ -35,7 +35,7 @@
 
 #include "oc.h"
 #include "ocdatatypes.h"
-#include "constraints.h"
+#include "occonstraints.h"
 #include "ocnode.h"
 #include "ocutil.h"
 #include "oclog.h"

oc/ocrc.c

@@ -15,7 +15,7 @@
 #include "occontent.h"
 #include "oclog.h"
 
-#include "rc.h"
+#include "ocrc.h"
 
 #define RTAG ']'
 #define LTAG '['

oc/ocread.c

@@ -13,10 +13,10 @@
 #endif
 #include "ocinternal.h"
 #include "ocdebug.h"
-#include "http.h"
-#include "read.h"
-#include "rc.h"
-#include "curlfunctions.h"
+#include "ochttp.h"
+#include "ocread.h"
+#include "ocrc.h"
+#include "occurlfunctions.h"
 
 extern int oc_curl_file_supported;