summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2001-03-11 18:36:13 (GMT)
committerTim Peters <tim.peters@gmail.com>2001-03-11 18:36:13 (GMT)
commitb2336529ef548181d53af151cf3fc116274846d6 (patch)
tree8c09d4a610d9524993fcba0d37a86fe0e9033625
parent7069512bd0e09c28a448f21721364ce9c5daa713 (diff)
downloadcpython-b2336529ef548181d53af151cf3fc116274846d6.zip
cpython-b2336529ef548181d53af151cf3fc116274846d6.tar.gz
cpython-b2336529ef548181d53af151cf3fc116274846d6.tar.bz2
Identifiers matching _[A-Z_]\w* are reserved for C implementations.
May or may not be related to bug 407680 (obmalloc.c - looks like it's corrupted). This repairs the illegal vrbl names, but leaves a pile of illegal macro names (_THIS_xxx, _SYSTEM_xxx, _SET_HOOKS, _FETCH_HOOKS).
-rw-r--r--Objects/obmalloc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index 4fcd187..43ddc72 100644
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -286,7 +286,7 @@ typedef uchar block;
/* Pool for small blocks */
struct pool_header {
- union { block *__padding;
+ union { block *_padding;
uint count; } ref; /* number of allocated blocks */
block *freeblock; /* pool's free list head */
struct pool_header *nextpool; /* next pool of this size class */
@@ -310,11 +310,11 @@ typedef struct pool_header *poolp;
/*
* This malloc lock
*/
-SIMPLELOCK_DECL(__malloc_lock);
-#define LOCK() SIMPLELOCK_LOCK(__malloc_lock)
-#define UNLOCK() SIMPLELOCK_UNLOCK(__malloc_lock)
-#define LOCK_INIT() SIMPLELOCK_INIT(__malloc_lock)
-#define LOCK_FINI() SIMPLELOCK_FINI(__malloc_lock)
+SIMPLELOCK_DECL(_malloc_lock);
+#define LOCK() SIMPLELOCK_LOCK(_malloc_lock)
+#define UNLOCK() SIMPLELOCK_UNLOCK(_malloc_lock)
+#define LOCK_INIT() SIMPLELOCK_INIT(_malloc_lock)
+#define LOCK_FINI() SIMPLELOCK_FINI(_malloc_lock)
/*
* Pool table -- doubly linked lists of partially used pools