Add XRegisterIMInstantiateCallback_arg6 so it will be defined.

diff --git a/src/ChangeLog b/src/ChangeLog
index 627f0d2b0f79a8040ffec97078310c137c9df57a..e2fb2baaaac47665189bf0c878130f19a4c6b77a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-26  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * config.in: Add XRegisterIMInstantiateCallback_arg6 so it
+       will be defined.
+
 2003-06-25  Stefan Monnier  <monnier@cs.yale.edu>
 
        * alloc.c (make_interval, Fmake_symbol, allocate_misc):

diff --git a/src/config.in b/src/config.in
index f9058e8ce377bdc751eb8ca8f0759f4b5687d785..2f5723c60ca3caacf00c5254c2fc8520422d87cc 100644 (file)
--- a/src/config.in
+++ b/src/config.in
@@ -537,6 +537,9 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 #undef HAVE_SYS_WAIT_H
 
+/* Define to 1 if you have the <sys/_mbstate_t.h> header file. */
+#undef HAVE_SYS__MBSTATE_T_H
+
 /* Define to 1 if you have the <termcap.h> header file. */
 #undef HAVE_TERMCAP_H
 
@@ -739,6 +742,10 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if using an X toolkit. */
 #undef USE_X_TOOLKIT
 
+/* Define to the type of the 6th arg of XRegisterIMInstantiateCallback, either
+   XPointer or XPointer*. */
+#undef XRegisterIMInstantiateCallback_arg6
+
 /* Define to 1 if on AIX 3.
    System headers sometimes define this.
    We just want to avoid a redefinition error message.  */
@@ -827,6 +834,9 @@ Boston, MA 02111-1307, USA.  */
 /* Turned on June 1996 supposing nobody will mind it.  */
 #define AMPERSAND_FULL_NAME
 
+/* We have blockinput.h.  */
+#define DO_BLOCK_INPUT
+
 /* Define HAVE_SOUND if we have sound support.  We know it works
    and compiles only on the specified platforms.   For others,
    it probably doesn't make sense to try.  */
@@ -903,6 +913,8 @@ Boston, MA 02111-1307, USA.  */
 #define mktime emacs_mktime
 #endif
 
+#define my_strftime nstrftime  /* for strftime.c */
+
 /* The rest of the code currently tests the CPP symbol BSTRING.
    Override any claims made by the system-description files.
    Note that on some SCO version it is possible to have bcopy and not bcmp.  */