From c4bc1569f63065d29b4c54f36346024678ae67ec Mon Sep 17 00:00:00 2001
From: dmh <dmh@unidata.ucar.edu>
Date: Fri, 26 Dec 2014 12:37:07 -0700
Subject: [PATCH] Update CMakelist to match Makefile.am in oc2

---
 oc2/CMakeLists.txt    | 4 +---
 oc2/Make0             | 1 -
 oc2/Makefile.am       | 1 -
 oc2/occurlflags.h     | 0
 oc2/occurlfunctions.h | 4 +++-
 5 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 oc2/occurlflags.h

diff --git a/oc2/CMakeLists.txt b/oc2/CMakeLists.txt
index 941e9ea26..bb0381669 100644
--- a/oc2/CMakeLists.txt
+++ b/oc2/CMakeLists.txt
@@ -1,9 +1,7 @@
-SET(oc_SOURCES oc.c daplex.c dapparse.c daptab.c occlientparams.c occompile.c occurlfunctions.c ocdata.c ocdebug.c ocdump.c ocinternal.c ocnode.c ochttp.c ocrc.c ocread.c ocutil.c ocbytes.c oclist.c ocuri.c oclog.c xxdr.c)
-
+SET(oc_SOURCES oc.c daplex.c dapparse.c daptab.c occlientparams.c occompile.c occurlfunctions.c ocdata.c ocdebug.c ocdump.c ocinternal.c ocnode.c ochttp.c ocrc.c ocread.c ocutil.c ocbytes.c oclist.c ocuri.c oclog.c occurlflags.c xxdr.c)
 
 add_library(oc2 OBJECT ${oc_SOURCES}) 
 
-
 ## Specify files to be distributed by 'make dist'
 FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
 SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
diff --git a/oc2/Make0 b/oc2/Make0
index bad13530d..08ba1d88f 100755
--- a/oc2/Make0
+++ b/oc2/Make0
@@ -22,7 +22,6 @@ ocdata.h ocdatatypes.h ocdebug.h ocdump.h \
 ocinternal.h ocnode.h \
 ochttp.h ocread.h ocutil.h \
 ocbytes.h oclist.h ocuri.h oclog.h \
-occurlflags.h \
 xxdr.h
 
 FILES=${HDRS} ${SRC} dap.y
diff --git a/oc2/Makefile.am b/oc2/Makefile.am
index 3b0dfa22a..467581643 100755
--- a/oc2/Makefile.am
+++ b/oc2/Makefile.am
@@ -29,7 +29,6 @@ ocdata.h ocdatatypes.h ocdebug.h ocdump.h \
 ocinternal.h ocnode.h \
 ochttp.h ocread.h ocutil.h \
 ocbytes.h oclist.h ocuri.h oclog.h \
-occurlflags.h \
 xxdr.h
 
 EXTRA_DIST = dap.y CMakeLists.txt
diff --git a/oc2/occurlflags.h b/oc2/occurlflags.h
deleted file mode 100644
index e69de29bb..000000000
diff --git a/oc2/occurlfunctions.h b/oc2/occurlfunctions.h
index 6720138b2..47c838034 100644
--- a/oc2/occurlfunctions.h
+++ b/oc2/occurlfunctions.h
@@ -10,7 +10,9 @@
 
 
 extern OCerror ocset_curlopt(OCstate* state, int flag, void* value);
-extern OCerror ocset_curlflagbyname(OCstate*, const char* name, void* value);
+
+struct OCCURLFLAG* occurlflagbyflag(int flag);
+struct OCCURLFLAG* occurlflagbyname(const char* name);
 
 extern OCerror ocset_flags_perfetch(OCstate*);
 extern OCerror ocset_flags_perlink(OCstate*);