[packages/vim.git] / 6.2.041

To: vim-dev@vim.org
Subject: Patch 6.2.041 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.2.041 (extra, after 6.2.033)
Problem:    Mac: Compiler warnings for conversion types, missing prototype,
	    missing return type.
Solution:   Change sscanf "%hd" to "%d", the argument is an int now.  Add
	    gui_mch_init_check() prototype.  Add "int" to termlib functions.
Files:	    src/gui_mac.c, src/proto/gui_mac.pro, src/termlib.c


*** ../vim-6.2.040/src/gui_mac.c	Fri Jul 25 22:22:15 2003
--- src/gui_mac.c	Sat Jul 26 21:03:13 2003
***************
*** 3205,3211 ****
  
  	    line[len-1] = '\0';
  
! 	    i = sscanf(line, "%hd %hd %hd %n", &r, &g, &b, &pos);
  	    if (i != 3)
  		continue;
  
--- 3205,3211 ----
  
  	    line[len-1] = '\0';
  
! 	    i = sscanf(line, "%d %d %d %n", &r, &g, &b, &pos);
  	    if (i != 3)
  		continue;
  
*** ../vim-6.2.040/src/proto/gui_mac.pro	Sun Mar 17 15:05:37 2002
--- src/proto/gui_mac.pro	Sat Jul 26 21:05:32 2003
***************
*** 21,26 ****
--- 21,27 ----
  int gui_mch_get_mouse_y __ARGS((void));
  void gui_mch_setmouse __ARGS((int x, int y));
  void gui_mch_prepare __ARGS((int *argc, char **argv));
+ int gui_mch_init_check __ARGS((void));
  int gui_mch_init __ARGS((void));
  void gui_mch_new_colors __ARGS((void));
  int gui_mch_open __ARGS((void));
*** ../vim-6.2.040/src/termlib.c	Tue Jul 10 21:06:56 2001
--- src/termlib.c	Sat Jul 26 21:15:51 2003
***************
*** 65,70 ****
--- 65,71 ----
  # endif
  #endif
  
+     int
  tgetent(tbuf, term)
      char    *tbuf;		/* Buffer to hold termcap entry, TBUFSZ bytes max */
      char    *term;		/* Name of terminal */
***************
*** 216,221 ****
--- 217,223 ----
   * Returned values: 1 for success, 0 for failure.
   */
  
+     int
  tgetflag(id)
      char *id;
  {
***************
*** 234,239 ****
--- 236,242 ----
   * Returned values: -1 for failure, else numerical value.
   */
  
+     int
  tgetnum(id)
      char *id;
  {
***************
*** 529,534 ****
--- 532,538 ----
      600,    1200,   1800,   2400,
      4800,   9600,   19200,  19200 };
  
+     int
  tputs(cp, affcnt, outc)
      char *cp;				/* string to print */
      int affcnt;				/* Number of lines affected */
*** ../vim-6.2.040/src/version.c	Sat Jul 26 21:22:37 2003
--- src/version.c	Sat Jul 26 21:24:04 2003
***************
*** 632,633 ****
--- 632,635 ----
  {   /* Add new patch number below this line */
+ /**/
+     41,
  /**/

-- 
ARTHUR:       You are indeed brave Sir knight, but the fight is mine.
BLACK KNIGHT: Had enough?
ARTHUR:       You stupid bastard.  You havn't got any arms left.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///          Creator of Vim - Vi IMproved -- http://www.Vim.org          \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\  Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html  ///
Commit	Line	Data
d8621708	1	To: vim-dev@vim.org
	2	Subject: Patch 6.2.041 (extra)
	3	Fcc: outbox
	4	From: Bram Moolenaar <Bram@moolenaar.net>
	5	Mime-Version: 1.0
	6	Content-Type: text/plain; charset=ISO-8859-1
	7	Content-Transfer-Encoding: 8bit
	8	------------
	9
	10	Patch 6.2.041 (extra, after 6.2.033)
	11	Problem: Mac: Compiler warnings for conversion types, missing prototype,
	12	missing return type.
	13	Solution: Change sscanf "%hd" to "%d", the argument is an int now. Add
	14	gui_mch_init_check() prototype. Add "int" to termlib functions.
	15	Files: src/gui_mac.c, src/proto/gui_mac.pro, src/termlib.c
	16
	17
	18	*** ../vim-6.2.040/src/gui_mac.c Fri Jul 25 22:22:15 2003
	19	--- src/gui_mac.c Sat Jul 26 21:03:13 2003
	20	***************
	21	* 3205,3211 **
	22
	23	line[len-1] = '\0';
	24
	25	! i = sscanf(line, "%hd %hd %hd %n", &r, &g, &b, &pos);
	26	if (i != 3)
	27	continue;
	28
	29	--- 3205,3211 ----
	30
	31	line[len-1] = '\0';
	32
	33	! i = sscanf(line, "%d %d %d %n", &r, &g, &b, &pos);
	34	if (i != 3)
	35	continue;
	36
	37	*** ../vim-6.2.040/src/proto/gui_mac.pro Sun Mar 17 15:05:37 2002
	38	--- src/proto/gui_mac.pro Sat Jul 26 21:05:32 2003
	39	***************
	40	* 21,26 **
	41	--- 21,27 ----
	42	int gui_mch_get_mouse_y __ARGS((void));
	43	void gui_mch_setmouse __ARGS((int x, int y));
	44	void gui_mch_prepare __ARGS((int argc, char *argv));
	45	+ int gui_mch_init_check __ARGS((void));
	46	int gui_mch_init __ARGS((void));
	47	void gui_mch_new_colors __ARGS((void));
	48	int gui_mch_open __ARGS((void));
	49	*** ../vim-6.2.040/src/termlib.c Tue Jul 10 21:06:56 2001
	50	--- src/termlib.c Sat Jul 26 21:15:51 2003
	51	***************
	52	* 65,70 **
	53	--- 65,71 ----
	54	# endif
	55	#endif
	56
	57	+ int
	58	tgetent(tbuf, term)
	59	char tbuf; / Buffer to hold termcap entry, TBUFSZ bytes max */
	60	char term; / Name of terminal */
	61	***************
	62	* 216,221 **
	63	--- 217,223 ----
	64	* Returned values: 1 for success, 0 for failure.
65	*/
66
67	+ int
68	tgetflag(id)
69	char *id;
70	{
71	***************
72	* 234,239 **
73	--- 236,242 ----
74	* Returned values: -1 for failure, else numerical value.
75	*/
76
77	+ int
78	tgetnum(id)
79	char *id;
80	{
81	***************
82	* 529,534 **
83	--- 532,538 ----
84	600, 1200, 1800, 2400,
85	4800, 9600, 19200, 19200 };
86
87	+ int
88	tputs(cp, affcnt, outc)
89	char cp; / string to print */
90	int affcnt; /* Number of lines affected */
91	*** ../vim-6.2.040/src/version.c Sat Jul 26 21:22:37 2003
92	--- src/version.c Sat Jul 26 21:24:04 2003
93	***************
94	* 632,633 **
95	--- 632,635 ----
96	{ /* Add new patch number below this line */
97	+ /**/
98	+ 41,
99	/**/
100
101	--
102	ARTHUR: You are indeed brave Sir knight, but the fight is mine.
103	BLACK KNIGHT: Had enough?
104	ARTHUR: You stupid bastard. You havn't got any arms left.
105	"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
106
107	/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
108	/// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\
109	\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
110	\\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html ///