On some systems, strncpy is a macro, and putting preprocessor

directives in the middle of a macro invocation appears to be frowned
on. Irritating, but there we go.

[originally from svn r8026]

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index fbd9a4d9db0c660e9e5a828f2f52489b457b9960..aa974546c9b2467d26322a86eecadf2d00b43b24 100644 (file)
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -367,14 +367,16 @@ void dlg_editbox_get(union control *ctrl, void *dlg, char *buffer, int length)
 #if GTK_CHECK_VERSION(2,0,0)
     } else {
        assert(uc->combo != NULL);
-       strncpy(buffer,
 #if GTK_CHECK_VERSION(2,6,0)
+       strncpy(buffer,
                gtk_combo_box_get_active_text(GTK_COMBO_BOX(uc->combo)),
+               length);
 #else
+       strncpy(buffer,
                gtk_entry_get_text
                (GTK_ENTRY(gtk_bin_get_child(GTK_BIN(uc->combo)))),
-#endif
                length);
+#endif
        buffer[length-1] = '\0';
     }
 #endif