Ticket #2917 (closed defect: fixed)
cygwin build failure
| Reported by: | matzeri | Owned by: | andrew_b |
|---|---|---|---|
| Priority: | major | Milestone: | 4.8.7 |
| Component: | mc-core | Version: | 4.8.1.6 |
| Keywords: | Cc: | ||
| Blocked By: | Blocking: | ||
| Branch state: | merged | Votes for changeset: | committed-master committed-stable |
Description
src/filemanager/mountlist.c
includes windows.h that calls w32api/objidl.h
as it includes
typedef enum tagDATADIR {
DATADIR_GET=1,
DATADIR_SET
} DATADIR;
the DATADIR definitions collides
with
libmcfilemanager_la_CFLAGS = -I$(top_srcdir) \
$(GLIB_CFLAGS) $(PCRE_CFLAGS) \
-DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\"
Two possible solution :
- bandguard the usage of windows.h
- use a different name than DATADIR
Attachments
Change History
Changed 12 years ago by matzeri
- Attachment mc-4.8.1.6-1.DATADIR.patch added
comment:1 Changed 12 years ago by andrew_b
- Status changed from new to accepted
- Owner set to andrew_b
- Branch state changed from no branch to on review
- Milestone changed from Future Releases to 4.8
DATADIR is used in src/main.c only. Other DATADIR removed.
Branch: 2917_cppflags_cleanup (parent: 4.8.1-stable).
Initial changeset:ec0defe60d162457921155e4afca995091e4b48f
comment:3 Changed 12 years ago by angel_il
- Votes for changeset changed from slavazanko to slavazanko 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 slavazanko angel_il to committed-master committed-stable
- Resolution set to fixed
- Branch state changed from approved to merged
- Milestone changed from 4.8 to 4.8.7
Merged to master: [d82757d2335eb1301f9aef511ca8f64e2762a0bd].
Merged to 4.8.1-stable: [864309974580c17f0306089d71a7fe591ad41809].
git log --pretty=oneline bf10a32..8643099
Note: See
TracTickets for help on using
tickets.
DATADIR bandguard