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).

diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index 4fcd18751f66e156e34009ca334d6af86bde01f2..43ddc728992f77c044d67ecc7bf789f339937331 100644 (file)
--- 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