From 87219596423f920642c624c872d6d2fb78b8140d Mon Sep 17 00:00:00 2001
From: Steve Naroff <snaroff@apple.com>
Date: Fri, 28 Aug 2009 12:07:44 +0000
Subject: [PATCH] Add CX prefix to Cursor and move a comment.

llvm-svn: 80359
---
 clang/include/clang-c/Index.h | 12 ++++++------
 clang/tools/CIndex/CIndex.cpp | 33 ++++++++++++++++++---------------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/clang/include/clang-c/Index.h b/clang/include/clang-c/Index.h
index 426223fb1afd..52ffb931ee1f 100644
--- a/clang/include/clang-c/Index.h
+++ b/clang/include/clang-c/Index.h
@@ -41,12 +41,12 @@ typedef void *CXCursor;  // An opaque cursor into the CXTranslationUnit.
 
 // Cursors represent declarations and references (provides line/column info).
 enum CXCursorKind {  
- Cursor_Declaration,
- Cursor_Reference,
- Cursor_ObjC_ClassRef,
- Cursor_ObjC_ProtocolRef,
- Cursor_ObjC_MessageRef,
- Cursor_ObjC_SelectorRef
+ CXCursor_Declaration,
+ CXCursor_Reference,
+ CXCursor_ObjC_ClassRef,
+ CXCursor_ObjC_ProtocolRef,
+ CXCursor_ObjC_MessageRef,
+ CXCursor_ObjC_SelectorRef
 };
 
 typedef void *CXDecl;    // A specific declaration within a translation unit.
diff --git a/clang/tools/CIndex/CIndex.cpp b/clang/tools/CIndex/CIndex.cpp
index 86e63607b473..ec575475ecd5 100644
--- a/clang/tools/CIndex/CIndex.cpp
+++ b/clang/tools/CIndex/CIndex.cpp
@@ -15,20 +15,6 @@
 
 extern "C" {
 
-// Some notes on CXEntity:
-//
-// - Since the 'ordinary' namespace includes functions, data, typedefs, ObjC interfaces, the
-// current algorithm is a bit naive (resulting in one entity for 2 different types). For example:
-//
-// module1.m: @interface Foo @end Foo *x;
-// module2.m: void Foo(int);
-//
-// - Since the unique name spans translation units, static data/functions within a CXTranslationUnit
-// are *not* currently represented by entities. As a result, there will be no entity for the following:
-//
-// module.m: static void Foo() { }
-//
-
 CXIndex clang_createIndex() 
 { 
   return 0; 
@@ -50,6 +36,23 @@ void clang_loadDeclaration(CXDecl, void (*callback)(CXDecl, CXCursor))
 {
 }
 
+// Some notes on CXEntity:
+//
+// - Since the 'ordinary' namespace includes functions, data, typedefs, 
+// ObjC interfaces, thecurrent algorithm is a bit naive (resulting in one 
+// entity for 2 different types). For example:
+//
+// module1.m: @interface Foo @end Foo *x;
+// module2.m: void Foo(int);
+//
+// - Since the unique name spans translation units, static data/functions 
+// within a CXTranslationUnit are *not* currently represented by entities.
+// As a result, there will be no entity for the following:
+//
+// module.m: static void Foo() { }
+//
+
+
 const char *clang_getDeclarationName(CXEntity)
 {
   return "";
@@ -94,7 +97,7 @@ CXCursor clang_getCursor(CXTranslationUnit, const char *source_name,
 
 CXCursorKind clang_getCursorKind(CXCursor)
 {
-  return Cursor_Declaration;
+  return CXCursor_Declaration;
 }
 
 unsigned clang_getCursorLine(CXCursor)