Ticket #2474 (closed defect: fixed)

Opened 14 years ago

Last modified 14 years ago

[patch] fix 4.7.5 build with --disable-charset

Reported by: dim Owned by:
Priority: minor Milestone: 4.8
Component: mcedit Version: master
Keywords: Cc:
Blocked By: Blocking:
Branch state: Votes for changeset:

Description

Hi,

I usually build mc with --disable-charset, which undefines HAVE_CHARSET in config.h. When building the latest version, 4.7.5, however, this leads to an error during linking of libedit:

...
  CC     libedit_la-edit.lo
edit.c: In function 'edit_move_forward3':
edit.c:2852: warning: implicit declaration of function 'convert_to_display_c'
edit.c:2852: warning: nested extern declaration of 'convert_to_display_c'
edit.c:2825: warning: unused variable 'utf_ch'
...
  CCLD   mc
editor/.libs/libedit.a(libedit_la-edit.o)(.text+0xe06): In function `edit_move_forward3':
: undefined reference to `convert_to_display_c'
gmake[3]: *** [mc] Error 1

Since convert_to_display_c is really a no-op in case HAVE_CHARSET is turned off, I guess the attached patch is the simplest way of fixing this. It also silences a warning about the unused utf_ch variable.

Attachments

mc-4.7.5-charset-1.diff​ (766 bytes) - added by dim 14 years ago.
Patch for --disable-charset build failure

Change History

Changed 14 years ago by dim

Patch for --disable-charset build failure

comment:1 Changed 14 years ago by andrew_b

  • Blocked By 2481 added

Thanks! Modified patch is applied in #2481.

comment:2 Changed 14 years ago by andrew_b

  • Status changed from new to closed
  • Resolution set to fixed
  • severity changed from no branch to merged
  • Blocked By 2481 removed

Fixed in master: changeset:1ceb2494e437b375c3edc8b8bd21802c95da5688
Fixed in 4.7.5-stable: changeset:4f4876abb4acb812747d1050c4b3be01da87780a

Note: See TracTickets for help on using tickets.