Attachment #156879 for bug #226659

View | Details | Raw Unified | Return to bug 226659
Collapse All | Expand All

Lines 22-28 Link Here

(-)src/backend/sword_main.hh.orig (-1 / +1 lines)
22	#ifndef _SWORD_MAIN_HH_	22	#ifndef _SWORD_MAIN_HH_
23	#define _SWORD_MAIN_HH_	23	#define _SWORD_MAIN_HH_
24		24
25		25	#include <string>
26	#include <swmgr.h>	26	#include <swmgr.h>
27	#include <swbuf.h>	27	#include <swbuf.h>
28	#include <versekey.h>	28	#include <versekey.h>




#endif

#ifdef __cplusplus
#include "backend/sword_main.hh"
extern "C" {

#include <gtk/gtk.h>
#include <swmgr.h>
#include <swdisp.h>
#include "main/global_ops.hh"
#include "backend/sword_main.hh"
#include "gui/utilities.h"

using namespace sword;

Return to bug 226659

Lines 25-37 Link Here

(-)src/main/display.hh.orig (-1 / +1 lines)
25	#endif	25	#endif
26		26
27	#ifdef __cplusplus	27	#ifdef __cplusplus
		28	#include "backend/sword_main.hh"
28	extern "C" {	29	extern "C" {
29		30
30	#include <gtk/gtk.h>	31	#include <gtk/gtk.h>
31	#include <swmgr.h>	32	#include <swmgr.h>
32	#include <swdisp.h>	33	#include <swdisp.h>
33	#include "main/global_ops.hh"	34	#include "main/global_ops.hh"
34	#include "backend/sword_main.hh"
35	#include "gui/utilities.h"	35	#include "gui/utilities.h"
36		36
37	using namespace sword;	37	using namespace sword;