pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/editors/conglomerate/patches Avoid another symbol name...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1b2e83a4a1e6
branches:  trunk
changeset: 603621:1b2e83a4a1e6
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Wed May 09 05:31:28 2012 +0000

description:
Avoid another symbol name conflict with clone(2).

diffstat:

 editors/conglomerate/patches/patch-src_cong-editor-line-iter-span-wrapper_c |  31 ++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)

diffs (35 lines):

diff -r e412f0111aa0 -r 1b2e83a4a1e6 editors/conglomerate/patches/patch-src_cong-editor-line-iter-span-wrapper_c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/conglomerate/patches/patch-src_cong-editor-line-iter-span-wrapper_c       Wed May 09 05:31:28 2012 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_cong-editor-line-iter-span-wrapper_c,v 1.1 2012/05/09 05:31:28 dholland Exp $
+
+Avoid symbol conflict with clone(2).
+
+--- src/cong-editor-line-iter-span-wrapper.c~  2004-11-04 19:18:48.000000000 +0000
++++ src/cong-editor-line-iter-span-wrapper.c
+@@ -26,13 +26,13 @@
+ #include "cong-editor-line-iter-span-wrapper.h"
+ 
+ static CongEditorLineIter*
+-clone (CongEditorLineIter *line_iter);
++clone_ (CongEditorLineIter *line_iter);
+ 
+ static CongEditorAreaLine*
+ get_line (CongEditorLineIter *line_iter);
+ 
+ CONG_DEFINE_CLASS_PUBLIC_DATA (CongEditorLineIterSpanWrapper, cong_editor_line_iter_span_wrapper, CONG_EDITOR_LINE_ITER_SPAN_WRAPPER, CongEditorLineIter, CONG_EDITOR_LINE_ITER_TYPE, 
+-                             CONG_EDITOR_LINE_ITER_CLASS (klass)->clone = clone;
++                             CONG_EDITOR_LINE_ITER_CLASS (klass)->clone = clone_;
+                              CONG_EDITOR_LINE_ITER_CLASS (klass)->get_line = get_line;)
+ 
+ /* Implementation of CongLineEditorIterSpanWrapper: */
+@@ -80,7 +80,7 @@ cong_editor_line_iter_span_wrapper_dispo
+ }
+ 
+ static CongEditorLineIter*
+-clone (CongEditorLineIter *line_iter)
++clone_ (CongEditorLineIter *line_iter)
+ {
+       CongEditorLineIterSpanWrapper* span_wrapper_iter = CONG_EDITOR_LINE_ITER_SPAN_WRAPPER (line_iter);
+       CongEditorLineIterSpanWrapper* new_iter;



Home | Main Index | Thread Index | Old Index