mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 12:56:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed preprocessor conditions.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2012-02-06 20:43:01 +03:00 committed by Slava Zanko
parent d38385eb37
commit 308237aa11
9 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/utilunix.c
View File

@ -623,7 +623,7 @@ custom_canonicalize_pathname (char *path, CANON_PATH_FLAGS flags)
else else
{ {
/* "token/../foo" -> "foo" */ /* "token/../foo" -> "foo" */
#if HAVE_CHARSET #ifdef HAVE_CHARSET
if ((strncmp (s, VFS_ENCODING_PREFIX, enc_prefix_len) == 0) if ((strncmp (s, VFS_ENCODING_PREFIX, enc_prefix_len) == 0)
&& (is_supported_encoding (s + enc_prefix_len))) && (is_supported_encoding (s + enc_prefix_len)))
/* special case: remove encoding */ /* special case: remove encoding */
@ -651,7 +651,7 @@ custom_canonicalize_pathname (char *path, CANON_PATH_FLAGS flags)
/* "foo/token/.." -> "foo" */ /* "foo/token/.." -> "foo" */
if (s == lpath + 1) if (s == lpath + 1)
s[0] = 0; s[0] = 0;
#if HAVE_CHARSET #ifdef HAVE_CHARSET
else if ((strncmp (s, VFS_ENCODING_PREFIX, enc_prefix_len) == 0) else if ((strncmp (s, VFS_ENCODING_PREFIX, enc_prefix_len) == 0)
&& (is_supported_encoding (s + enc_prefix_len))) && (is_supported_encoding (s + enc_prefix_len)))
{ {

2
lib/vfs/vfs.c
View File

@ -148,7 +148,7 @@ _vfs_translate_path (const char *path, int size, GIConv defcnv, GString * buffer
memcpy (encoding, semi, ms); memcpy (encoding, semi, ms);
encoding[ms] = '\0'; encoding[ms] = '\0';
#if HAVE_CHARSET #ifdef HAVE_CHARSET
if (is_supported_encoding (encoding)) if (is_supported_encoding (encoding))
coder = str_crt_conv_to (encoding); coder = str_crt_conv_to (encoding);
#endif #endif

2
src/filemanager/chmod.c
View File

@ -144,7 +144,7 @@ chmod_i18n (void)
i18n = TRUE; i18n = TRUE;
#if ENABLE_NLS #ifdef ENABLE_NLS
for (i = 0; i < check_perm_num; i++) for (i = 0; i < check_perm_num; i++)
check_perm[i].text = _(check_perm[i].text); check_perm[i].text = _(check_perm[i].text);

2
src/filemanager/cmd.c
View File

@ -894,7 +894,7 @@ edit_cmd_force_internal (void)
void void
edit_cmd_new (void) edit_cmd_new (void)
{ {
#if HAVE_CHARSET #ifdef HAVE_CHARSET
mc_global.source_codepage = default_source_codepage; mc_global.source_codepage = default_source_codepage;
#endif #endif
do_edit (NULL); do_edit (NULL);

2
src/filemanager/find.c
View File

@ -119,7 +119,7 @@ typedef struct
static char **find_ignore_dirs = NULL; static char **find_ignore_dirs = NULL;
/* Size of the find parameters window */ /* Size of the find parameters window */
#if HAVE_CHARSET #ifdef HAVE_CHARSET
static int FIND_Y = 19; static int FIND_Y = 19;
#else #else
static int FIND_Y = 18; static int FIND_Y = 18;

5
src/filemanager/midnight.c
View File

@ -458,8 +458,7 @@ toggle_panels_split (void)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
#if ENABLE_VFS #ifdef ENABLE_VFS
/* event helper */ /* event helper */
static gboolean static gboolean
check_panel_timestamp (const WPanel * panel, panel_view_mode_t mode, struct vfs_class *vclass, check_panel_timestamp (const WPanel * panel, panel_view_mode_t mode, struct vfs_class *vclass,
@ -626,7 +625,7 @@ create_panels (void)
else else
current_panel = left_panel; current_panel = left_panel;
#if ENABLE_VFS #ifdef ENABLE_VFS
mc_event_add (MCEVENT_GROUP_CORE, "vfs_timestamp", check_other_panel_timestamp, NULL, NULL); mc_event_add (MCEVENT_GROUP_CORE, "vfs_timestamp", check_other_panel_timestamp, NULL, NULL);
mc_event_add (MCEVENT_GROUP_CORE, "vfs_timestamp", check_current_panel_timestamp, NULL, NULL); mc_event_add (MCEVENT_GROUP_CORE, "vfs_timestamp", check_current_panel_timestamp, NULL, NULL);
#endif /* ENABLE_VFS */ #endif /* ENABLE_VFS */

2
src/filemanager/mountlist.c
View File

@ -436,7 +436,7 @@ fstype_to_string (short int t)
static char * static char *
fsp_to_string (const struct statfs *fsp) fsp_to_string (const struct statfs *fsp)
{ {
#if HAVE_STRUCT_STATFS_F_FSTYPENAME #ifdef HAVE_STRUCT_STATFS_F_FSTYPENAME
return (char *) (fsp->f_fstypename); return (char *) (fsp->f_fstypename);
#else #else
return fstype_to_string (fsp->f_type); return fstype_to_string (fsp->f_type);

2
src/filemanager/panel.c
View File

@ -2603,7 +2603,7 @@ do_enter_on_file_entry (file_entry * fe)
g_free (cmd); g_free (cmd);
} }
#if HAVE_CHARSET #ifdef HAVE_CHARSET
mc_global.source_codepage = default_source_codepage; mc_global.source_codepage = default_source_codepage;
#endif #endif

2
src/main.c
View File

@ -291,7 +291,7 @@ do_cd (const vfs_path_t * new_dir_vpath, enum cd_enum exact)
res = do_panel_cd (current_panel, _new_dir_vpath, exact); res = do_panel_cd (current_panel, _new_dir_vpath, exact);
#if HAVE_CHARSET #ifdef HAVE_CHARSET
if (res) if (res)
{ {
const vfs_path_element_t *path_element; const vfs_path_element_t *path_element;