1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71
|
#! /bin/sh -e
## 15_fix_gcc_4_0.dpatch by Otavio Salvador <otavio@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix FTBFS with GCC 4.0.
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
exit 1
fi
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
case "$1" in
-patch) patch -p1 ${patch_opts} < $0;;
-unpatch) patch -R -p1 ${patch_opts} < $0;;
*)
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
exit 1;;
esac
exit 0
@DPATCH@
--- a/src/sd/dv/erdiagram.c
+++ b/src/sd/dv/erdiagram.c
@@ -43,6 +43,9 @@
#include "replacedialog.h"
#include "erdiagram.h"
#include "menu.h"
+
+class Edge;
+class C1Edge;
ERDiagram::ERDiagram(Config *c, ERWindow *d, ERViewer *v, ERGraph *g):
Diagram(c,d,v,g) {
--- a/src/sd/dv/function.h
+++ b/src/sd/dv/function.h
@@ -19,8 +19,8 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//-----------------------------------------------------------------------------
-#ifndef _FUNCTION_H
-#define _FUNCTION_H
+#ifndef _FUNCTION_CLASS_H
+#define _FUNCTION_CLASS_H
#include "c1edge.h"
class ERGraph;
--- a/src/ui/menu.c
+++ b/src/ui/menu.c
@@ -217,7 +217,7 @@ Widget Menu::BuildMenu(Widget parent, Me
XmNindicatorType, XmONE_OF_MANY, 0);
}
// selected or not ?
- if ((int)items[i].userData & 0x1)
+ if ((long)items[i].userData & 0x1)
XtVaSetValues(submenu, XmNset, True, 0);
}
--- a/src/ui/application.h
+++ b/src/ui/application.h
@@ -28,6 +28,7 @@ class MessageLogDialog;
class PrinterOptions;
class Color;
class Config;
+class MainWindow;
/// generic window-based application class. See: MWidget.
class Application: public MWidget {
|