cvsuser 04/01/06 07:59:00
Modified: include/parrot tsq.h
src tsq.c
Log:
src/events.c attempts to call peek_entry(), which is defined in src/tsq.c.
Currently, peek_entry is declared and defined as PARROT_INLINE, which expands
to __inline under xlc. This in turn implies internal linkage for peek_entry
(at least it does here), resulting in "events.c: Static function peek_entry
is undefined."
Courtesy of Adam Thomason
Revision Changes Path
1.9 +2 -2 parrot/include/parrot/tsq.h
Index: tsq.h
===================================================================
RCS file: /cvs/public/parrot/include/parrot/tsq.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- tsq.h 16 Dec 2003 11:33:16 -0000 1.8
+++ tsq.h 6 Jan 2004 15:58:57 -0000 1.9
@@ -1,7 +1,7 @@
/* tsq.h
* Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
* CVS Info
- * $Id: tsq.h,v 1.8 2003/12/16 11:33:16 leo Exp $
+ * $Id: tsq.h,v 1.9 2004/01/06 15:58:57 leo Exp $
* Overview:
* Defines the thread-safe queue system
* Data Structure and Algorithms:
@@ -42,7 +42,7 @@
QUEUE_ENTRY *pop_entry(QUEUE *);
QUEUE_ENTRY *nosync_pop_entry(QUEUE *queue);
-PARROT_INLINE QUEUE_ENTRY *peek_entry(QUEUE *);
+QUEUE_ENTRY *peek_entry(QUEUE *);
QUEUE_ENTRY *wait_for_entry(QUEUE *);
void push_entry(QUEUE *, QUEUE_ENTRY *);
void nosync_insert_entry(QUEUE *, QUEUE_ENTRY *);
1.13 +2 -2 parrot/src/tsq.c
Index: tsq.c
===================================================================
RCS file: /cvs/public/parrot/src/tsq.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- tsq.c 27 Dec 2003 11:40:55 -0000 1.12
+++ tsq.c 6 Jan 2004 15:58:59 -0000 1.13
@@ -1,7 +1,7 @@
/* tsq.c
* Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
* CVS Info
- * $Id: tsq.c,v 1.12 2003/12/27 11:40:55 leo Exp $
+ * $Id: tsq.c,v 1.13 2004/01/06 15:58:59 leo Exp $
* Overview:
* Thread-safe queues
* Data Structure and Algorithms:
@@ -28,7 +28,7 @@
* but the synched pop_entry checks again and returns NULL, if
* queue is empty
*/
-PARROT_INLINE QUEUE_ENTRY *
+QUEUE_ENTRY *
peek_entry(QUEUE *queue) {
return queue->head;
}
