commit 98ec85a88848ffc5acc60e8548af67da475b0660
author Jeff Thompson <jefft0@gmail.com> Tue Dec 17 11:57:56 2013 -0800
committer Jeff Thompson <jefft0@gmail.com> Tue Dec 17 11:57:56 2013 -0800
tree 38cc15d5f1640828e6dc594334c2aa5ead0f7bfc
parent 7781b39d5a59ba455607bc3109a6059655e1d699

Rename key.h to key-locator.h. Refs #1089.

src/c/data.h

diff --git a/src/c/data.h b/src/c/data.h
index 68ed6ed..4750ae9 100644
--- a/src/c/data.h
+++ b/src/c/data.h
@@ -10,7 +10,7 @@
 #include <ndn-cpp/c/data-types.h>
 #include "name.h"
 #include "publisher-public-key-digest.h"
-#include "key.h"
+#include "key-locator.h"
 
 #ifdef __cplusplus
 extern "C" {

src/c/encoding/binary-xml-key.h

diff --git a/src/c/encoding/binary-xml-key.h b/src/c/encoding/binary-xml-key.h
index 391fa72..efd8f54 100644
--- a/src/c/encoding/binary-xml-key.h
+++ b/src/c/encoding/binary-xml-key.h
@@ -7,7 +7,7 @@
 #ifndef NDN_BINARYXMLKEY_H
 #define NDN_BINARYXMLKEY_H
 
-#include "../key.h"
+#include "../key-locator.h"
 #include "../errors.h"
 #include "binary-xml-encoder.h"
 #include "binary-xml-decoder.h"

src/c/key-locator.h

diff --git a/src/c/key.h b/src/c/key-locator.h
similarity index 97%
rename from src/c/key.h
rename to src/c/key-locator.h
index b7f8751..b609d97 100644
--- a/src/c/key.h
+++ b/src/c/key-locator.h
@@ -4,8 +4,8 @@
  * See COPYING for copyright and distribution information.
  */
 
-#ifndef NDN_KEY_H
-#define NDN_KEY_H
+#ifndef NDN_KEY_LOCATOR_H
+#define NDN_KEY_LOCATOR_H
 
 #include <ndn-cpp/c/key-types.h>
 #include "name.h"