mirror
/
dl-fldigi
kopia lustrzana https://github.com/jamescoxon/dl-fldigi
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

FreeBSD nitems 

* Collision between Fltk-3.0 and FreeBSD system corrected
    in associated fluid definition file.
pull/1/head
David Freese 2014-08-29 03:25:14 -05:00
rodzic da7a43a538
commit ea5bcb9d87
2 zmienionych plików z 20 dodań i 0 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
src/include/lgbook.h
Wyświetl plik

@ -4,6 +4,14 @@
#define lgbook_h
#include <FL/Fl.H>
#include "flinput2.h"
// Avoid 'nitems' macro collision between FreeBSD's sys/params.h and fltk's
// FL/Fl_Check_Browser.H (http://www.fltk.org/str.php?L2984)
#undef nitems
#include <FL/Fl_Check_Browser.H>
#define FLTK_nitems nitems
#undef nitems
// ^^^ Avoid 'nitems' macro collision
extern Fl_Check_Browser *chkExportBrowser;
#include <FL/Fl_Double_Window.H>
extern Fl_Double_Window *wExport;
#include <FL/Fl_Group.H>

12
src/logbook/lgbook.fl
Wyświetl plik

@ -23,6 +23,18 @@ decl {\#include "pixmaps.h"} {private local
decl {\#include "flinput2.h"} {public local
}
decl {
// Avoid 'nitems' macro collision between FreeBSD's sys/params.h and fltk's
// FL/Fl_Check_Browser.H (http://www.fltk.org/str.php?L2984)
\#undef nitems
\#include <FL/Fl_Check_Browser.H>
\#define FLTK_nitems nitems
\#undef nitems
// ^^^ Avoid 'nitems' macro collision
extern Fl_Check_Browser *chkExportBrowser;
} {public local
}
Function {create_logbook_dialogs()} {open return_type void
} {
Fl_Window wExport {