[m-rev.] diff: fix problems preventing the system building in non-C grades

[Julien Fischer]

Fix problems preventing the system building in non-C grades.

compiler/mode_info.m:
 	Avoid a warning due to the Mercury clause for the predicate
 	old_and_new_may_differ/2 having too tight a determinism.

compiler/pickle.m:
 	Fix cut-and-paste errors in Erlang foreign procs.

deep_profiler/DEEP_FLAGS.in:
 	Specify the location of the Erlang library headers.

Julien.

diff --git a/compiler/mode_info.m b/compiler/mode_info.m
index e55df53..5ae09d5 100644
--- a/compiler/mode_info.m
+++ b/compiler/mode_info.m
@@ -738,7 +738,8 @@ mode_info_set_in_dupl_for_switch(X, !MI) :-
      %
  :- pred old_and_new_may_differ(T::in, T::in) is semidet.

-old_and_new_may_differ(_, _).
+old_and_new_may_differ(_, _) :-
+    semidet_true.

  :- pragma foreign_proc("C",
      old_and_new_may_differ(Old::in, New::in),
diff --git a/compiler/pickle.m b/compiler/pickle.m
index 931ce7a..5e09347 100644
--- a/compiler/pickle.m
+++ b/compiler/pickle.m
@@ -202,7 +202,7 @@ user_defined_pickler(picklers(Pickles), TypeCtorDesc, Pickle) :-
      pickler_inst_cast(A::in, B::out(pickler_pred)),
      [will_not_call_mercury, thread_safe, promise_pure],
  "
-    B = A;
+    B = A
  ").

  :- pragma foreign_proc("C#",
@@ -342,7 +342,7 @@ user_defined_unpickler(unpicklers(Unpicklers), TypeCtorDesc, Unpickle) :-
      unpickler_inst_cast(A::in, B::out(unpickler_pred)),
      [will_not_call_mercury, thread_safe, promise_pure],
  "
-    B = A;
+    B = A
  ").

  :- pragma foreign_proc("C#",
diff --git a/deep_profiler/DEEP_FLAGS.in b/deep_profiler/DEEP_FLAGS.in
index 1d507f6..462cb53 100644
--- a/deep_profiler/DEEP_FLAGS.in
+++ b/deep_profiler/DEEP_FLAGS.in
@@ -23,4 +23,5 @@
  --java-classpath ../library/mer_std.jar
  --java-classpath ../browser/mer_browser.jar
  --java-classpath ../mdbcomp/mer_mdbcomp.jar
+--erlang-include-directory ../library/Mercury/hrls
  --config-file ../scripts/Mercury.config.bootstrap