nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-25 09:12:24 +00:00
Code Issues Projects Releases Wiki Activity

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

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

[originally from svn r8026]
This commit is contained in:
Simon Tatham 2008-05-31 13:29:32 +00:00
parent 85c227326c
commit 79f7249185
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
unix/gtkdlg.c
View File

@ -367,14 +367,16 @@ void dlg_editbox_get(union control *ctrl, void *dlg, char *buffer, int length)
#if GTK_CHECK_VERSION(2,0,0) #if GTK_CHECK_VERSION(2,0,0)
} else { } else {
assert(uc->combo != NULL); assert(uc->combo != NULL);
strncpy(buffer,
#if GTK_CHECK_VERSION(2,6,0) #if GTK_CHECK_VERSION(2,6,0)
strncpy(buffer,
gtk_combo_box_get_active_text(GTK_COMBO_BOX(uc->combo)), gtk_combo_box_get_active_text(GTK_COMBO_BOX(uc->combo)),
length);
#else #else
strncpy(buffer,
gtk_entry_get_text gtk_entry_get_text
(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(uc->combo)))), (GTK_ENTRY(gtk_bin_get_child(GTK_BIN(uc->combo)))),
#endif
length); length);
#endif
buffer[length-1] = '\0'; buffer[length-1] = '\0';
} }
#endif #endif