Author: Armin Rigo <[email protected]>
Branch:
Changeset: r47640:141df9290774
Date: 2011-09-27 22:05 +0200
http://bitbucket.org/pypy/pypy/changeset/141df9290774/
Log: Remove the leftover references to AVR. Whoever manages to figure
out what it was for without spending at least 15 minutes looking at
the svn history is awarded a beer by me at the next sprint.
diff --git a/pypy/translator/c/src/allocator.h
b/pypy/translator/c/src/allocator.h
--- a/pypy/translator/c/src/allocator.h
+++ b/pypy/translator/c/src/allocator.h
@@ -6,11 +6,6 @@
#ifndef PYPY_NOT_MAIN_FILE
-#ifdef AVR
- #ifndef NO_OBMALLOC
- #define NO_OBMALLOC
- #endif
-#endif
#if defined(TRIVIAL_MALLOC_DEBUG)
void *PyObject_Malloc(size_t n) { return malloc(n); }
diff --git a/pypy/translator/c/src/g_include.h
b/pypy/translator/c/src/g_include.h
--- a/pypy/translator/c/src/g_include.h
+++ b/pypy/translator/c/src/g_include.h
@@ -31,9 +31,7 @@
#include "src/char.h"
#include "src/float.h"
#include "src/address.h"
-#ifndef AVR
#include "src/unichar.h"
-#endif
#include "src/llgroup.h"
#include "src/instrument.h"
@@ -48,11 +46,9 @@
# include "src/rtyper.h"
# include "src/debug_traceback.h"
# include "src/debug_alloc.h"
-#ifndef AVR
# include "src/ll_os.h"
# include "src/ll_strtod.h"
#endif
-#endif
#ifdef PYPY_STANDALONE
# include "src/allocator.h"
diff --git a/pypy/translator/c/src/g_prerequisite.h
b/pypy/translator/c/src/g_prerequisite.h
--- a/pypy/translator/c/src/g_prerequisite.h
+++ b/pypy/translator/c/src/g_prerequisite.h
@@ -13,10 +13,8 @@
# include <io.h> /* needed, otherwise _lseeki64 truncates to 32-bits (??) */
#endif
-#ifndef AVR
#include "thread.h" /* needs to be included early to define the
struct RPyOpaque_ThreadLock */
-#endif
#include <stddef.h>
diff --git a/pypy/translator/c/src/main.h b/pypy/translator/c/src/main.h
--- a/pypy/translator/c/src/main.h
+++ b/pypy/translator/c/src/main.h
@@ -75,9 +75,7 @@
memory_out:
errmsg = "out of memory";
error:
-#ifndef AVR
fprintf(stderr, "Fatal error during initialization: %s\n", errmsg);
-#endif
abort();
return 1;
}
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
