fix annotations

from_cpython/Include/Python.h

@@ -184,8 +184,6 @@ PyAPI_FUNC(void) PyGC_Disable() PYSTON_NOEXCEPT;
 extern "C" {
 #endif
 
-PyObject* PyModule_GetDict(PyObject*) PYSTON_NOEXCEPT;
-
 // Pyston change : expose these type objects
 extern PyTypeObject Pattern_Type;
 extern PyTypeObject Match_Type;

from_cpython/Include/object.h

@@ -10,7 +10,6 @@ extern "C" {
 // Pyston addition: refcounting annotations:
 #define BORROWED(T) T
 #define STOLEN(T) T
-#define WEAK(T) T
 
 /* Object and type object interface */
 

src/core/stringpool.h

@@ -81,7 +81,7 @@ public:
 
     llvm::StringRef s() const;
     operator llvm::StringRef() const { return s(); }
-    operator BoxedString*() const { return getBox(); }
+    operator BORROWED(BoxedString*)() const { return getBox(); }
 
     bool isCompilerCreatedName() const;
 

src/runtime/types.cpp

@@ -2127,7 +2127,7 @@ public:
 // or PyModule_GetDict to return real dicts.
 class AttrWrapper : public Box {
 private:
-    WEAK(Box*) b; // The parent object ('b') will keep the attrwrapper alive (forever)
+    BORROWED(Box*) b; // The parent object ('b') will keep the attrwrapper alive (forever)
 
     void convertToDictBacked() {
         HCAttrs* attrs = this->b->getHCAttrsPtr();

src/runtime/types.h

@@ -1317,7 +1317,7 @@ inline BoxedString* getStaticString(llvm::StringRef s) {
 
 extern "C" volatile int _pendingcalls_to_do;
 
-inline Box* Box::getattrString(const char* attr) {
+inline BORROWED(Box*) Box::getattrString(const char* attr) {
     // XXX need to auto-decref
     BoxedString* s = internStringMortal(attr);
     try {