Ticket #2639 (closed defect: fixed)
doesn't compile with gcc 4.6 when using --disable-nls
| Reported by: | ossi | Owned by: | andrew_b |
|---|---|---|---|
| Priority: | major | Milestone: | 4.8.1 |
| Component: | mc-core | Version: | 4.8.0 |
| Keywords: | Cc: | ||
| Blocked By: | Blocking: | ||
| Branch state: | merged | Votes for changeset: | committed-master |
Description
problem:
main.c: In function 'main': main.c:384:12: error: expected expression before ';' token main.c:385:12: error: expected expression before ';' token
fix:
--- a/lib/global.h +++ b/lib/global.h @@ -79,10 +79,10 @@ #endif #else /* Stubs that do something close enough. */ -#define textdomain(String) +#define textdomain(String) 1 #define gettext(String) (String) #define ngettext(String1,String2,Num) (((Num) == 1) ? (String1) : (String2)) #define dgettext(Domain,Message) (Message) #define dcgettext(Domain,Message,Type) (Message) -#define bindtextdomain(Domain,Directory) +#define bindtextdomain(Domain,Directory) 1 #define _(String) (String) #define N_(String) (String)
Change History
comment:2 Changed 12 years ago by andrew_b
- Status changed from new to accepted
- Votes for changeset set to andrew_b
- Version changed from master to 4.8.0
- Branch state changed from no branch to on review
- Milestone changed from Future Releases to 4.8.1
- Owner set to andrew_b
Created 2639_compile_disable_nls branch (parent: master).
changeset:1c0cc50a3f921d4348d7a1efab62d380f830b5f1
comment:3 Changed 12 years ago by angel_il
- Votes for changeset changed from andrew_b to andrew_b angel_il
- Branch state changed from on review to approved
comment:4 Changed 12 years ago by andrew_b
- Status changed from accepted to testing
- Votes for changeset changed from andrew_b angel_il to committed-master
- Resolution set to fixed
- Branch state changed from approved to merged
Merged to master.
changeset:1c0cc50a3f921d4348d7a1efab62d380f830b5f1
Note: See
TracTickets for help on using
tickets.
We both found the same problem. And, yes, you were first.
Somebody was a little too aggressive in "cleaning up the code for v4.8.0".
Guido