commit e6f84dbe9b13213c3d6201e17f49011a43c43587
author Jeff Thompson <jefft0@gmail.com> Mon Oct 21 17:29:44 2013 -0700
committer Jeff Thompson <jefft0@gmail.com> Mon Oct 21 17:29:44 2013 -0700
tree bdb64cb98ae5fa0674025f626ca9180e637387fd
parent 4d004799f04e86f7e8571ff74d410fbddb368117

interest: Move ndn_Interest_CHILD_SELECTOR_LEFT, etc. to public interest-types.h

include/ndn-cpp/c/interest-types.h

diff --git a/include/ndn-cpp/c/interest-types.h b/include/ndn-cpp/c/interest-types.h
index 21c80d9..a464e17 100644
--- a/include/ndn-cpp/c/interest-types.h
+++ b/include/ndn-cpp/c/interest-types.h
@@ -16,7 +16,18 @@
   ndn_Exclude_ANY = 1  
 } ndn_ExcludeType;
 
+enum {
+  ndn_Interest_CHILD_SELECTOR_LEFT = 0,
+  ndn_Interest_CHILD_SELECTOR_RIGHT = 1,
 
+  ndn_Interest_ANSWER_NO_CONTENT_STORE = 0,
+  ndn_Interest_ANSWER_CONTENT_STORE = 1,
+  ndn_Interest_ANSWER_GENERATED = 2,
+  ndn_Interest_ANSWER_STALE = 4,    // Stale answer OK
+  ndn_Interest_MARK_STALE = 16,      // Must have scope 0.  Michael calls this a "hack"
+
+  ndn_Interest_DEFAULT_ANSWER_ORIGIN_KIND = ndn_Interest_ANSWER_CONTENT_STORE | ndn_Interest_ANSWER_GENERATED
+};
 
 #ifdef __cplusplus
 }

ndn-cpp/c/interest.h

diff --git a/ndn-cpp/c/interest.h b/ndn-cpp/c/interest.h
index 438fecd..53bcdf6 100644
--- a/ndn-cpp/c/interest.h
+++ b/ndn-cpp/c/interest.h
@@ -74,19 +74,6 @@
  */
 int ndn_Exclude_matches(struct ndn_Exclude *self, struct ndn_NameComponent *component);
 
-enum {
-  ndn_Interest_CHILD_SELECTOR_LEFT = 0,
-  ndn_Interest_CHILD_SELECTOR_RIGHT = 1,
-
-  ndn_Interest_ANSWER_NO_CONTENT_STORE = 0,
-  ndn_Interest_ANSWER_CONTENT_STORE = 1,
-  ndn_Interest_ANSWER_GENERATED = 2,
-  ndn_Interest_ANSWER_STALE = 4,    // Stale answer OK
-  ndn_Interest_MARK_STALE = 16,      // Must have scope 0.  Michael calls this a "hack"
-
-  ndn_Interest_DEFAULT_ANSWER_ORIGIN_KIND = ndn_Interest_ANSWER_CONTENT_STORE | ndn_Interest_ANSWER_GENERATED
-};
-
 /**
  * An ndn_Interest holds an ndn_Name and other fields for an interest.
  */