Loading ...
Sorry, an error occurred while loading the content.

69996Re: Patch 7.3.1004

Expand Messages
  • Bram Moolenaar
    May 22, 2013
    • 0 Attachment
      Mats Bertil Tegner wrote:

      > On 05/21/2013 10:38 PM, Bram Moolenaar wrote:
      > >
      > > Patch 7.3.1004
      > > Problem: No error when option could not be set.
      > > Solution: Report an error. (ZyX)
      > > Files: src/if_py_both.h, src/option.c, src/proto/option.pro,
      > > src/testdir/test86.ok, src/testdir/test87.ok
      >
      > [...]
      >
      > > --- src/proto/option.pro 2013-05-21 22:27:50.000000000 +0200
      > > ***************
      > > *** 23,29 ****
      > > char_u *check_stl_option __ARGS((char_u *s));
      > > int get_option_value __ARGS((char_u *name, long *numval, char_u **stringval, int opt_flags));
      > > int get_option_value_strict __ARGS((char_u *name, long *numval, char_u **stringval, int opt_type, void *from));
      > > ! void set_option_value __ARGS((char_u *name, long number, char_u *string, int opt_flags));
      > > char_u *get_term_code __ARGS((char_u *tname));
      > > char_u *get_highlight_default __ARGS((void));
      > > char_u *get_encoding_default __ARGS((void));
      > > --- 23,29 ----
      > > char_u *check_stl_option __ARGS((char_u *s));
      > > int get_option_value __ARGS((char_u *name, long *numval, char_u **stringval, int opt_flags));
      > > int get_option_value_strict __ARGS((char_u *name, long *numval, char_u **stringval, int opt_type, void *from));
      > > ! char_u *set_option_value __ARGS((char_u *name, long number, char_u *string, int opt_flags));
      > > char_u *get_term_code __ARGS((char_u *tname));
      > > char_u *get_highlight_default __ARGS((void));
      > > char_u *get_encoding_default __ARGS((void));
      > > *** ../vim-7.3.1003/src/testdir/test86.ok 2013-05-21 22:23:51.000000000 +0200
      > > --- src/testdir/test86.ok 2013-05-21 22:27:50.000000000 +0200
      > > ***************
      >
      > [...]
      >
      > I'm unable to compile vim under Slackware Linux with this patch applied.
      > Compilation halts with the following errors:
      >
      > SOURCE -D_FORTIFY_SOURCE=1 -o objects/os_unix.o os_unix.c
      > option.c:8980:1: error: conflicting types for 'set_option_value'
      > set_option_value(name, number, string, opt_flags)
      > ^
      > In file included from proto.h:153:0,
      > from vim.h:1939,
      > from option.c:35:
      > proto/option.pro:26:6: note: previous declaration of 'set_option_value'
      > was her
      > void set_option_value __ARGS((char_u *name, long number, char_u
      > *string, int opt_flags));
      > ^
      > make[1]: *** [objects/option.o] Error 1
      > make[1]: *** Waiting for unfinished jobs....
      > make[1]: Leaving directory `/tmp/vim73/src'
      > make: *** [first] Error 2
      > Starting make in the src directory.
      > If there are problems, cd to the src directory and run make there
      > cd src && make first
      > make[1]: Entering directory `/tmp/vim73/src'
      > gcc -c -I. -Iproto -DHAVE_CONFIG_H -I/usr/local/include -O2 -fPIC
      > -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -o objects/option.o option.c
      > option.c:8980:1: error: conflicting types for 'set_option_value'
      > set_option_value(name, number, string, opt_flags)
      > ^
      > In file included from proto.h:153:0,
      > from vim.h:1939,
      > from option.c:35:
      > proto/option.pro:26:6: note: previous declaration of 'set_option_value'
      > was her
      > void set_option_value __ARGS((char_u *name, long number, char_u
      > *string, int opt_flags));
      > ^
      > make[1]: *** [objects/option.o] Error 1
      > make[1]: Leaving directory `/tmp/vim73/src'
      > make: *** [first] Error 2
      > root@hp-laptop:/home/mats/Downloads/vim#

      Looks like you somehow didn't apply the patch to src/proto/option.pro.

      --
      CART DRIVER: Bring out your dead!
      We follow the cart through a wretched, impoverished plague-ridden village.
      A few starved mongrels run about in the mud scavenging. In the open
      doorway of one house perhaps we jug glimpse a pair of legs dangling from
      the ceiling. In another doorway an OLD WOMAN is beating a cat against a
      wall rather like one does with a mat. The cart passes round a dead donkey
      or cow in the mud. And a MAN tied to a cart is being hammered to death by
      four NUNS with huge mallets.
      "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

      /// Bram Moolenaar -- Bram@... -- http://www.Moolenaar.net \\\
      /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
      \\\ an exciting new programming language -- http://www.Zimbu.org ///
      \\\ help me help AIDS victims -- http://ICCF-Holland.org ///

      --
      --
      You received this message from the "vim_dev" maillist.
      Do not top-post! Type your reply below the text you are replying to.
      For more information, visit http://www.vim.org/maillist.php

      ---
      You received this message because you are subscribed to the Google Groups "vim_dev" group.
      To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscribe@....
      For more options, visit https://groups.google.com/groups/opt_out.
    • Show all 4 messages in this topic