[m-rev.] trivial diff: avoid namespace check failure in .par grades

Julien Fischer juliensf at csse.unimelb.edu.au
Thu Aug 31 00:07:48 AEST 2006


Estimated hours taken: 0.1
Branches: main

Avoid failing the namespace cleanliness check in .par grades.
Boehm GC now intercepts several pthread functions.

browser/RESERVED_MACRO_NAMES:
library/RESERVED_MACRO_NAMES:
runtime/RESERVED_MACRO_NAMES:
trace/RESERVED_MACRO_NAMES:
 	Conform to the recent update of the Boehm collector.

Julien.

Index: library/RESERVED_MACRO_NAMES
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/library/RESERVED_MACRO_NAMES,v
retrieving revision 1.4
diff -u -r1.4 RESERVED_MACRO_NAMES
--- library/RESERVED_MACRO_NAMES	28 Jun 2006 04:46:19 -0000	1.4
+++ library/RESERVED_MACRO_NAMES	30 Aug 2006 13:53:47 -0000
@@ -34,6 +34,13 @@
  LINUX_THREADS
  REVEAL_POINTER
  #-----------------------------------------------------------------------------#
+# These are defined by boehm_gc/include/gc_pthread_redirects.h
+dlopen
+pthread_create
+pthread_detach
+pthread_join
+pthread_sigmask
+#-----------------------------------------------------------------------------#
  # This is defined by mps_gc/code/mercury_mps.h,
  # which uses this macro for its header guard.
  # Normally it would be better to use uppercase for header guard macro names,
Index: runtime/RESERVED_MACRO_NAMES
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/runtime/RESERVED_MACRO_NAMES,v
retrieving revision 1.19
diff -u -r1.19 RESERVED_MACRO_NAMES
--- runtime/RESERVED_MACRO_NAMES	30 Aug 2006 13:31:07 -0000	1.19
+++ runtime/RESERVED_MACRO_NAMES	30 Aug 2006 13:51:53 -0000
@@ -34,6 +34,13 @@
  HIDE_POINTER
  REVEAL_POINTER
  #-----------------------------------------------------------------------------#
+# These are defined by boehm_gc/include/gc_pthread_redirects.h
+dlopen
+pthread_create
+pthread_detach
+pthread_join
+pthread_sigmask
+#-----------------------------------------------------------------------------#
  # This is defined by mps_gc/code/mercury_mps.h,
  # which uses this macro for its header guard.
  # Normally it would be better to use uppercase for header guard macro names,
Index: browser/RESERVED_MACRO_NAMES
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/browser/RESERVED_MACRO_NAMES,v
retrieving revision 1.5
diff -u -r1.5 RESERVED_MACRO_NAMES
--- browser/RESERVED_MACRO_NAMES	28 Jun 2006 04:46:13 -0000	1.5
+++ browser/RESERVED_MACRO_NAMES	30 Aug 2006 13:55:15 -0000
@@ -34,6 +34,13 @@
  LINUX_THREADS
  REVEAL_POINTER
  #-----------------------------------------------------------------------------#
+# These are defined by boehm_gc/include/gc_pthread_redirects.h
+dlopen
+pthread_create
+pthread_detach
+pthread_join
+pthread_sigmask
+#-----------------------------------------------------------------------------#
  # This is defined by mps_gc/code/mercury_mps.h,
  # which uses this macro for its header guard.
  # Normally it would be better to use uppercase for header guard macro names,
Index: trace/RESERVED_MACRO_NAMES
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/trace/RESERVED_MACRO_NAMES,v
retrieving revision 1.3
diff -u -r1.3 RESERVED_MACRO_NAMES
--- trace/RESERVED_MACRO_NAMES	28 Jun 2006 04:46:26 -0000	1.3
+++ trace/RESERVED_MACRO_NAMES	30 Aug 2006 14:01:52 -0000
@@ -34,6 +34,13 @@
  LINUX_THREADS
  REVEAL_POINTER
  #-----------------------------------------------------------------------------#
+# These are defined by boehm_gc/include/gc_pthread_redirects.h
+dlopen
+pthread_create
+pthread_detach
+pthread_join
+pthread_sigmask
+#-----------------------------------------------------------------------------#
  # This is defined by mps_gc/code/mercury_mps.h,
  # which uses this macro for its header guard.
  # Normally it would be better to use uppercase for header guard macro names,
--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------



More information about the reviews mailing list