Changeset 13c1a0c in mainline

Timestamp:

2006-02-26T10:20:36Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a0c732e

Parents:

085434a

Message:

Fix conflict between asid_get() macro and function definitions.

File:

• generic/include/mm/asid.h (modified) (2 diffs)

generic/include/mm/asid.h

@@ -49 +49 @@
 #ifndef __ASM__
 
-
 #define ASIDS_ALLOCABLE ((ASID_MAX+1)-ASID_START)
 
@@ -55 +54 @@
 extern link_t as_with_asid_head;
 
-extern asid_t asid_get(void);        /*This is in collision with ia32 macro*/
+#ifndef asid_get
+extern asid_t asid_get(void);
+#endif /* !def asid_get */
+
+#ifndef asid_put
 extern void asid_put(asid_t asid);
+#endif /* !def asid_put */
 
 #ifndef asid_install