4 From: Bram Moolenaar <Bram@moolenaar.net>
6 Content-Type: text/plain; charset=ISO-8859-1
7 Content-Transfer-Encoding: 8bit
11 Problem: Code is repeated in the two Perl files.
12 Solution: Move common code from if_perl.xs and if_perlsfio.c to vim.h.
13 Also fix a problem with generating prototypes.
14 Files: src/if_perl.xs, src/if_perlsfio.c, src/vim.h
17 *** ../vim-6.2.138/src/if_perl.xs Mon May 19 23:02:45 2003
18 --- src/if_perl.xs Wed Oct 29 12:26:30 2003
25 - * Avoid clashes between Perl and Vim namespace.
35 - /* remove MAX and MIN, included by glib.h, redefined by sys/param.h */
42 - /* We use _() for gettext(), Perl uses it for function prototypes... */
54 - /* Borland has the structure stati64 but not _stati64 */
55 - # define _stati64 stati64
58 - /* OK, nasty namespace hacking over... */
65 * Work around clashes between Perl and Vim namespace. proto.h doesn't
69 # define perl_free dll_perl_free
70 # define Perl_get_context dll_Perl_get_context
71 # define Perl_croak dll_Perl_croak
72 ! # define Perl_croak_nocontext dll_Perl_croak_nocontext
73 # define Perl_dowantarray dll_Perl_dowantarray
74 # define Perl_free_tmps dll_Perl_free_tmps
75 # define Perl_gv_stashpv dll_Perl_gv_stashpv
77 # define perl_free dll_perl_free
78 # define Perl_get_context dll_Perl_get_context
79 # define Perl_croak dll_Perl_croak
81 ! # define Perl_croak_nocontext dll_Perl_croak_nocontext
82 ! # define Perl_call_argv dll_Perl_call_argv
83 ! # define Perl_call_pv dll_Perl_call_pv
84 ! # define Perl_eval_sv dll_Perl_eval_sv
85 ! # define Perl_get_sv dll_Perl_get_sv
86 ! # define Perl_eval_pv dll_Perl_eval_pv
87 ! # define Perl_call_method dll_Perl_call_method
89 # define Perl_dowantarray dll_Perl_dowantarray
90 # define Perl_free_tmps dll_Perl_free_tmps
91 # define Perl_gv_stashpv dll_Perl_gv_stashpv
94 # define Perl_newSV dll_Perl_newSV
95 # define Perl_newSViv dll_Perl_newSViv
96 # define Perl_newSVpv dll_Perl_newSVpv
97 - # define Perl_call_argv dll_Perl_call_argv
98 - # define Perl_call_pv dll_Perl_call_pv
99 - # define Perl_eval_sv dll_Perl_eval_sv
100 - # define Perl_get_sv dll_Perl_get_sv
101 - # define Perl_eval_pv dll_Perl_eval_pv
102 - # define Perl_call_method dll_Perl_call_method
103 # define Perl_pop_scope dll_Perl_pop_scope
104 # define Perl_push_scope dll_Perl_push_scope
105 # define Perl_save_int dll_Perl_save_int
107 *** ../vim-6.2.138/src/if_perlsfio.c Tue Feb 13 15:02:49 2001
108 --- src/if_perlsfio.c Wed Oct 29 12:27:43 2003
115 - * Avoid clashes between Perl and Vim namespace.
122 - /* remove MAX and MIN, included by glib.h, redefined by sys/param.h */
129 - /* We use _() for gettext(), Perl uses it for function prototypes... */
137 - #include <EXTERN.h>
141 #if defined(USE_SFIO) || defined(PROTO)
143 #ifndef USE_SFIO /* just generating prototypes */
145 *** ../vim-6.2.138/src/vim.h Wed Oct 29 14:37:09 2003
146 --- src/vim.h Wed Oct 29 12:51:00 2003
153 + #ifdef IN_PERL_FILE
155 + * Avoid clashes between Perl and Vim namespace.
162 + # ifdef __BORLANDC__
165 + /* remove MAX and MIN, included by glib.h, redefined by sys/param.h */
172 + /* We use _() for gettext(), Perl uses it for function prototypes... */
189 + # ifdef __BORLANDC__
190 + /* Borland has the structure stati64 but not _stati64 */
191 + # define _stati64 stati64
194 + # include <EXTERN.h>
200 *** ../vim-6.2.138/src/version.c Wed Oct 29 14:40:27 2003
201 --- src/version.c Wed Oct 29 14:42:42 2003
205 { /* Add new patch number below this line */
211 [Autumn changed into Winter ... Winter changed into Spring ... Spring
212 changed back into Autumn and Autumn gave Winter and Spring a miss and
213 went straight on into Summer ... Until one day ...]
214 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
216 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
217 /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\
218 \\\ Project leader for A-A-P -- http://www.A-A-P.org ///
219 \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html ///