[llvm-branch-commits] [llvm-branch] r126582 - in /llvm/branches/Apple/whitney: include/llvm-c/lto.h tools/lto/lto.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Sun Feb 27 15:49:00 2011
New Revision: 126582

URL: http://llvm.org/viewvc/llvm-project?rev=126582&view=rev
Log:
Merge r123038:
--
Author: Devang Patel <dpatel at apple.com>
Date:   Fri Jan 7 22:26:25 2011 +0000

    Do not include DataTypes.h in llvm-c/lto.h.
    This means avoid using uint32_t. This patch reverts r112200 and fixes original  problem by fixing argument type in lto.cpp.

*** MANUAL MERGE ***

Modified:
    llvm/branches/Apple/whitney/include/llvm-c/lto.h
    llvm/branches/Apple/whitney/tools/lto/lto.cpp

Modified: llvm/branches/Apple/whitney/include/llvm-c/lto.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/whitney/include/llvm-c/lto.h?rev=126582&r1=126581&r2=126582&view=diff
==============================================================================
--- llvm/branches/Apple/whitney/include/llvm-c/lto.h (original)
+++ llvm/branches/Apple/whitney/include/llvm-c/lto.h Sun Feb 27 15:49:00 2011
@@ -18,7 +18,6 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include "llvm/System/DataTypes.h"
 
 #define LTO_API_VERSION 4
 
@@ -147,7 +146,7 @@
 /**
  * Returns the number of symbols in the object module.
  */
-extern uint32_t
+extern unsigned int
 lto_module_get_num_symbols(lto_module_t mod);
 
 
@@ -155,14 +154,14 @@
  * Returns the name of the ith symbol in the object module.
  */
 extern const char*
-lto_module_get_symbol_name(lto_module_t mod, uint32_t index);
+lto_module_get_symbol_name(lto_module_t mod, unsigned int index);
 
 
 /**
  * Returns the attributes of the ith symbol in the object module.
  */
 extern lto_symbol_attributes
-lto_module_get_symbol_attribute(lto_module_t mod, uint32_t index);
+lto_module_get_symbol_attribute(lto_module_t mod, unsigned int index);
 
 
 /**

Modified: llvm/branches/Apple/whitney/tools/lto/lto.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/whitney/tools/lto/lto.cpp?rev=126582&r1=126581&r2=126582&view=diff
==============================================================================
--- llvm/branches/Apple/whitney/tools/lto/lto.cpp (original)
+++ llvm/branches/Apple/whitney/tools/lto/lto.cpp Sun Feb 27 15:49:00 2011
@@ -132,7 +132,7 @@
 //
 // returns the number of symbols in the object module
 //
-uint32_t lto_module_get_num_symbols(lto_module_t mod)
+unsigned int lto_module_get_num_symbols(lto_module_t mod)
 {
     return mod->getSymbolCount();
 }
@@ -140,7 +140,7 @@
 //
 // returns the name of the ith symbol in the object module
 //
-const char* lto_module_get_symbol_name(lto_module_t mod, uint32_t index)
+const char* lto_module_get_symbol_name(lto_module_t mod, unsigned int index)
 {
     return mod->getSymbolName(index);
 }
@@ -150,7 +150,7 @@
 // returns the attributes of the ith symbol in the object module
 //
 lto_symbol_attributes lto_module_get_symbol_attribute(lto_module_t mod, 
-                                                      uint32_t index)
+                                                      unsigned int index)
 {
     return mod->getSymbolAttributes(index);
 }