NS: Fix build with NSTRACE_ENABLED

* src/nsterm.h (NSTRACE_MSG_NO_DASHES): Use
nstrace_enabled_global.
* src/nsterm.m: ([EmacsView performDragOperation:]): Don't use
an NSString.

(cherry picked from commit 2d1d1f31df355bde96b9c033e49c9e2eb7274a1d)

diff --git a/src/nsterm.h b/src/nsterm.h
index 2abf402f8bc104e7768172258719e1e277fa6fa6..d9d16ffabd383a026fd034921bd53466ecbbb555 100644 (file)
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -185,7 +185,7 @@ char const * nstrace_fullscreen_type_name (int);
 #define NSTRACE_MSG_NO_DASHES(...)                                          \
   do                                                                        \
     {                                                                       \
-      if (nstrace_enabled)                                                  \
+      if (nstrace_enabled_global)                                                  \
         {                                                                   \
           fprintf (stderr, "%-10s:%5d: [%5d]%.*s",                          \
                    __FILE__, __LINE__, nstrace_num++,                       \

diff --git a/src/nsterm.m b/src/nsterm.m
index 0b19d01115100bea839b5e4c6fd08194dc05f29f..14f47973e542faa16b0283d21cf8796fcebee684 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -9123,7 +9123,7 @@ ns_in_echo_area (void)
   Lisp_Object type_sym;
   struct input_event ie;
 
-  NSTRACE (@"[EmacsView performDragOperation:]");
+  NSTRACE ("[EmacsView performDragOperation:]");
 
   source = [sender draggingSource];