From 875d5c53d70e3276f2b37b6c2ea7ecfbd38ed843 Mon Sep 17 00:00:00 2001 From: Pete Fritchman Date: Sat, 8 Jun 2002 02:37:13 +0000 Subject: [PATCH] Fix build on -current with gcc 3.1. Submitted by: bento --- editors/hte/files/patch-analyser::analy.cc | 31 ++++++++++++++ editors/hte/files/patch-blockop.cc | 13 ++++++ editors/hte/files/patch-cstream.cc | 13 ++++++ editors/hte/files/patch-htdialog.cc | 49 ++++++++++++++++++++++ editors/hte/files/patch-htformat.cc | 13 ++++++ editors/hte/files/patch-htobj.cc | 22 ++++++++++ editors/hte/files/patch-htpal.cc | 13 ++++++ editors/hte/files/patch-htsearch.cc | 13 ++++++ editors/hte/files/patch-httree.cc | 31 ++++++++++++++ editors/hte/files/patch-stream.cc | 13 ++++++ 10 files changed, 211 insertions(+) create mode 100644 editors/hte/files/patch-analyser::analy.cc create mode 100644 editors/hte/files/patch-blockop.cc create mode 100644 editors/hte/files/patch-cstream.cc create mode 100644 editors/hte/files/patch-htdialog.cc create mode 100644 editors/hte/files/patch-htformat.cc create mode 100644 editors/hte/files/patch-htobj.cc create mode 100644 editors/hte/files/patch-htpal.cc create mode 100644 editors/hte/files/patch-htsearch.cc create mode 100644 editors/hte/files/patch-httree.cc create mode 100644 editors/hte/files/patch-stream.cc diff --git a/editors/hte/files/patch-analyser::analy.cc b/editors/hte/files/patch-analyser::analy.cc new file mode 100644 index 000000000000..d1b9f0ddd874 --- /dev/null +++ b/editors/hte/files/patch-analyser::analy.cc @@ -0,0 +1,31 @@ +$FreeBSD$ + +--- analyser/analy.cc.orig Fri Jun 7 21:53:04 2002 ++++ analyser/analy.cc Fri Jun 7 21:53:40 2002 +@@ -415,7 +415,7 @@ + /* + * addaddrlabel will never overwrite an existing label (like addlabel) + */ +-bool analyser::add_addr_label(ADDR Addr, char *Prefix, labeltype type, taddr *infunc=NULL) ++bool analyser::add_addr_label(ADDR Addr, char *Prefix, labeltype type, taddr *infunc) + { + if (!valid_addr(Addr, scvalid)) return false; + +@@ -461,7 +461,7 @@ + * fail if label exist on another address + * + */ +-bool analyser::add_label(ADDR Addr, char *label, labeltype type, taddr *infunc=NULL) ++bool analyser::add_label(ADDR Addr, char *label, labeltype type, taddr *infunc) + { + if (!valid_addr(Addr, scvalid)) return false; + +@@ -545,7 +545,7 @@ + /* + * + */ +-bool analyser::assign_label(ADDR Addr, char *label, labeltype type, taddr *infunc=NULL) ++bool analyser::assign_label(ADDR Addr, char *label, labeltype type, taddr *infunc) + { + if (!valid_addr(Addr, scvalid)) return false; + diff --git a/editors/hte/files/patch-blockop.cc b/editors/hte/files/patch-blockop.cc new file mode 100644 index 000000000000..94cc1642fba8 --- /dev/null +++ b/editors/hte/files/patch-blockop.cc @@ -0,0 +1,13 @@ +$FreeBDS$ + +--- blockop.cc.orig Fri Jun 7 21:56:30 2002 ++++ blockop.cc Fri Jun 7 21:56:36 2002 +@@ -41,7 +41,7 @@ + * CLASS ht_blockop_dialog + */ + +-void ht_blockop_dialog::init(bounds *b, FILEOFS pstart, FILEOFS pend, ht_list *history=0) ++void ht_blockop_dialog::init(bounds *b, FILEOFS pstart, FILEOFS pend, ht_list *history) + { + ht_dialog::init(b, "operate on block", FS_TITLE | FS_KILLER | FS_MOVE); + bounds c; diff --git a/editors/hte/files/patch-cstream.cc b/editors/hte/files/patch-cstream.cc new file mode 100644 index 000000000000..acddec51bc87 --- /dev/null +++ b/editors/hte/files/patch-cstream.cc @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- cstream.cc.orig Fri Jun 7 21:58:54 2002 ++++ cstream.cc Fri Jun 7 21:59:01 2002 +@@ -26,7 +26,7 @@ + + #include + +-void ht_compressed_stream::init(ht_stream *stream, bool own_stream, UINT granularity=COMPRESSED_STREAM_DEFAULT_GRANULARITY) ++void ht_compressed_stream::init(ht_stream *stream, bool own_stream, UINT granularity) + { + ht_layer_stream::init(stream, own_stream); + if ((get_access_mode() & (FAM_READ | FAM_WRITE)) == (FAM_READ | FAM_WRITE)) { diff --git a/editors/hte/files/patch-htdialog.cc b/editors/hte/files/patch-htdialog.cc new file mode 100644 index 000000000000..5e06df63b0df --- /dev/null +++ b/editors/hte/files/patch-htdialog.cc @@ -0,0 +1,49 @@ +$FreeBSD$ + +--- htdialog.cc.orig Fri Jun 7 22:00:40 2002 ++++ htdialog.cc Fri Jun 7 22:01:25 2002 +@@ -569,7 +569,7 @@ + * CLASS ht_inputfield + */ + +-void ht_inputfield::init(bounds *b, int _maxtextlen, ht_list *_history=0) ++void ht_inputfield::init(bounds *b, int _maxtextlen, ht_list *_history) + { + ht_view::init(b, VO_SELECTABLE, "some inputfield"); + VIEW_DEBUG_NAME("ht_inputfield"); +@@ -727,7 +727,7 @@ + * CLASS ht_strinputfield + */ + +-void ht_strinputfield::init(bounds *b, int maxstrlen, ht_list *history=0) ++void ht_strinputfield::init(bounds *b, int maxstrlen, ht_list *history) + { + ht_inputfield::init(b, maxstrlen, history); + VIEW_DEBUG_NAME("ht_strinputfield"); +@@ -1319,7 +1319,7 @@ + * ht_listbox + */ + +-void ht_listbox::init(bounds *b, UINT Listboxcaps=LISTBOX_QUICKFIND) ++void ht_listbox::init(bounds *b, UINT Listboxcaps) + { + ht_view::init(b, VO_SELECTABLE | VO_OWNBUFFER | VO_RESIZE, 0); + +@@ -1784,7 +1784,7 @@ + * ht_text_listbox + */ + +-void ht_text_listbox::init(bounds *b, int Cols, int Keycol, UINT Listboxcaps=LISTBOX_QUICKFIND) ++void ht_text_listbox::init(bounds *b, int Cols, int Keycol, UINT Listboxcaps) + { + cols = Cols; + keycol = Keycol; +@@ -2046,7 +2046,7 @@ + * CLASS ht_itext_listbox + */ + +-void ht_itext_listbox::init(bounds *b, int Cols=1, int Keycol=0) ++void ht_itext_listbox::init(bounds *b, int Cols, int Keycol) + { + ht_text_listbox::init(b, Cols, Keycol); + } diff --git a/editors/hte/files/patch-htformat.cc b/editors/hte/files/patch-htformat.cc new file mode 100644 index 000000000000..3aeeee813437 --- /dev/null +++ b/editors/hte/files/patch-htformat.cc @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- htformat.cc.orig Fri Jun 7 22:03:32 2002 ++++ htformat.cc Fri Jun 7 22:03:41 2002 +@@ -4234,7 +4234,7 @@ + * CLASS ht_mask + */ + +-void ht_mask_sub::init(ht_streamfile *f, UINT u, fmt_vaddress ba=0) ++void ht_mask_sub::init(ht_streamfile *f, UINT u, fmt_vaddress ba) + { + ht_sub::init(f); + masks = new ht_string_list(); diff --git a/editors/hte/files/patch-htobj.cc b/editors/hte/files/patch-htobj.cc new file mode 100644 index 000000000000..8ca3601a344b --- /dev/null +++ b/editors/hte/files/patch-htobj.cc @@ -0,0 +1,22 @@ +$FreeBSD$ + +--- htobj.cc.orig Fri Jun 7 22:15:43 2002 ++++ htobj.cc Fri Jun 7 22:15:56 2002 +@@ -672,7 +672,7 @@ + sendmsg(&m); + } + +-void ht_view::sendmsg(int msg, int data1=0, int data2=0) ++void ht_view::sendmsg(int msg, int data1, int data2) + { + htmsg m; + switch (msg) { +@@ -1419,7 +1419,7 @@ + * CLASS ht_frame + */ + +-void ht_frame::init(bounds *b, char *desc, UINT _style, UINT _number=0) ++void ht_frame::init(bounds *b, char *desc, UINT _style, UINT _number) + { + ht_view::init(b, VO_RESIZE, desc); + VIEW_DEBUG_NAME("ht_frame"); diff --git a/editors/hte/files/patch-htpal.cc b/editors/hte/files/patch-htpal.cc new file mode 100644 index 000000000000..e33551556b33 --- /dev/null +++ b/editors/hte/files/patch-htpal.cc @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- htpal.cc.orig Fri Jun 7 22:17:48 2002 ++++ htpal.cc Fri Jun 7 22:18:26 2002 +@@ -214,7 +214,7 @@ + * CLASS palette_entry + */ + +-palette_entry::palette_entry(UINT _idx=0, vcp _color=0) ++palette_entry::palette_entry(UINT _idx, vcp _color) + { + idx=_idx; + color=_color; diff --git a/editors/hte/files/patch-htsearch.cc b/editors/hte/files/patch-htsearch.cc new file mode 100644 index 000000000000..25bc8322f0dd --- /dev/null +++ b/editors/hte/files/patch-htsearch.cc @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- htsearch.cc.orig Fri Jun 7 22:20:50 2002 ++++ htsearch.cc Fri Jun 7 22:20:58 2002 +@@ -780,7 +780,7 @@ + * CLASS ht_expr_search_form + */ + +-void ht_expr_search_form::init(bounds *b, int options, ht_list *history=0) ++void ht_expr_search_form::init(bounds *b, int options, ht_list *history) + { + ht_group::init(b, VO_SELECTABLE, NULL); + VIEW_DEBUG_NAME("ht_expr_search_form"); diff --git a/editors/hte/files/patch-httree.cc b/editors/hte/files/patch-httree.cc new file mode 100644 index 000000000000..eea0367d4dc7 --- /dev/null +++ b/editors/hte/files/patch-httree.cc @@ -0,0 +1,31 @@ +$FreeBSD$ + +--- httree.cc.orig Fri Jun 7 22:23:41 2002 ++++ httree.cc Fri Jun 7 22:24:02 2002 +@@ -380,7 +380,7 @@ + ht_treeview::done(); + } + +-void *ht_static_treeview::add_child(void *node, char *text, ht_data *Data=NULL) ++void *ht_static_treeview::add_child(void *node, char *text, ht_data *Data) + { + if (node) { + return add_node(&((static_node *)node)->child, text, Data); +@@ -394,7 +394,7 @@ + } + } + +-void *ht_static_treeview::add_node(static_node **node, char *text, ht_data *Data=NULL) ++void *ht_static_treeview::add_node(static_node **node, char *text, ht_data *Data) + { + static_node **p = node; + static_node *prev = NULL; +@@ -413,7 +413,7 @@ + ((static_node *)node)->expanded = expand; + } + +-static_node *ht_static_treeview::create_node(char *text, static_node *prev, ht_data *Data=NULL) ++static_node *ht_static_treeview::create_node(char *text, static_node *prev, ht_data *Data) + { + static_node *node = (static_node *)malloc(sizeof(static_node)); + node->text = ht_strdup(text); diff --git a/editors/hte/files/patch-stream.cc b/editors/hte/files/patch-stream.cc new file mode 100644 index 000000000000..3d8916961d03 --- /dev/null +++ b/editors/hte/files/patch-stream.cc @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- stream.cc.orig Fri Jun 7 22:30:45 2002 ++++ stream.cc Fri Jun 7 22:30:52 2002 +@@ -611,7 +611,7 @@ + * CLASS ht_memmap_file + */ + +-void ht_memmap_file::init(byte *b, UINT s = 0) ++void ht_memmap_file::init(byte *b, UINT s) + { + ht_streamfile::init(); + buf = b;