* xdisp.c (message): Do not use NO_ARG_ARRAY.

diff --git a/src/ChangeLog b/src/ChangeLog
index c962fe04af67257a0858aca76764edb06c606d50..668dc24e2292c870f14191e01fd46e4472ba00b1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2010-04-15  Dan Nicolaescu  <dann@ics.uci.edu>
 
+       * xdisp.c (message): Do not use NO_ARG_ARRAY.
+
        * frame.h (FRAME_SAMPLE_VISIBILITY): Remove unused 0 in comma expression.
 
 2010-04-14  Dan Nicolaescu  <dann@ics.uci.edu>

diff --git a/src/xdisp.c b/src/xdisp.c
index 902651dcc444be3ab13a2886e30a8b6574d3b77b..7523da8bd7bdd49bf209b9c3070300e244f7b5ba 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -8472,7 +8472,6 @@ message (m, a1, a2, a3)
          if (m)
            {
              int len;
-#ifdef NO_ARG_ARRAY
              char *a[3];
              a[0] = (char *) a1;
              a[1] = (char *) a2;
@@ -8480,11 +8479,6 @@ message (m, a1, a2, a3)
 
              len = doprnt (FRAME_MESSAGE_BUF (f),
                            FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3, a);
-#else
-             len = doprnt (FRAME_MESSAGE_BUF (f),
-                           FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3,
-                           (char **) &a1);
-#endif /* NO_ARG_ARRAY */
 
              message2 (FRAME_MESSAGE_BUF (f), len, 0);
            }