[packages/vim.git] / 6.2.040

To: vim-dev@vim.org
Subject: Patch 6.2.040
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.040
Problem:    FreeBSD: Crash while starting up when compiled with +xsmp feature.
Solution:   Pass a non-NULL argument to IceAddConnectionWatch().
Files:	    src/os_unix.c


*** ../vim-6.2.039/src/os_unix.c	Thu Jul 24 22:09:03 2003
--- src/os_unix.c	Sat Jul 26 20:37:06 2003
***************
*** 5930,5935 ****
--- 5930,5936 ----
  	return OK;
  }
  
+ static int dummy;
  
  /* Set up X Session Management Protocol */
      void
***************
*** 5959,5966 ****
      smcallbacks.shutdown_cancelled.callback = xsmp_shutdown_cancelled;
      smcallbacks.shutdown_cancelled.client_data = NULL;
  
!     /* Set up a watch on ICE connection creations */
!     if (IceAddConnectionWatch(xsmp_ice_connection, NULL) == 0)
      {
  	if (p_verbose > 0)
  	    MSG(_("XSMP ICE connection watch failed"));
--- 5960,5968 ----
      smcallbacks.shutdown_cancelled.callback = xsmp_shutdown_cancelled;
      smcallbacks.shutdown_cancelled.client_data = NULL;
  
!     /* Set up a watch on ICE connection creations.  The "dummy" argument is
!      * apparently required for FreeBSD (we get a BUS error when using NULL). */
!     if (IceAddConnectionWatch(xsmp_ice_connection, &dummy) == 0)
      {
  	if (p_verbose > 0)
  	    MSG(_("XSMP ICE connection watch failed"));
*** ../vim-6.2.039/src/version.c	Sat Jul 26 19:49:46 2003
--- src/version.c	Sat Jul 26 20:38:35 2003
***************
*** 632,633 ****
--- 632,635 ----
  {   /* Add new patch number below this line */
+ /**/
+     40,
  /**/

-- 
ARTHUR:       Now stand aside worthy adversary.
BLACK KNIGHT: (Glancing at his shoulder) 'Tis but a scratch.
ARTHUR:       A scratch?  Your arm's off.
                 "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.040
	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.040
	11	Problem: FreeBSD: Crash while starting up when compiled with +xsmp feature.
	12	Solution: Pass a non-NULL argument to IceAddConnectionWatch().
	13	Files: src/os_unix.c
	14
	15
	16	*** ../vim-6.2.039/src/os_unix.c Thu Jul 24 22:09:03 2003
	17	--- src/os_unix.c Sat Jul 26 20:37:06 2003
	18	***************
	19	* 5930,5935 **
	20	--- 5930,5936 ----
	21	return OK;
	22	}
	23
	24	+ static int dummy;
	25
	26	/* Set up X Session Management Protocol */
	27	void
	28	***************
	29	* 5959,5966 **
	30	smcallbacks.shutdown_cancelled.callback = xsmp_shutdown_cancelled;
	31	smcallbacks.shutdown_cancelled.client_data = NULL;
	32
	33	! /* Set up a watch on ICE connection creations */
	34	! if (IceAddConnectionWatch(xsmp_ice_connection, NULL) == 0)
	35	{
	36	if (p_verbose > 0)
	37	MSG(_("XSMP ICE connection watch failed"));
	38	--- 5960,5968 ----
	39	smcallbacks.shutdown_cancelled.callback = xsmp_shutdown_cancelled;
	40	smcallbacks.shutdown_cancelled.client_data = NULL;
	41
	42	! /* Set up a watch on ICE connection creations. The "dummy" argument is
	43	! * apparently required for FreeBSD (we get a BUS error when using NULL). */
	44	! if (IceAddConnectionWatch(xsmp_ice_connection, &dummy) == 0)
	45	{
	46	if (p_verbose > 0)
	47	MSG(_("XSMP ICE connection watch failed"));
	48	*** ../vim-6.2.039/src/version.c Sat Jul 26 19:49:46 2003
	49	--- src/version.c Sat Jul 26 20:38:35 2003
	50	***************
	51	* 632,633 **
	52	--- 632,635 ----
	53	{ /* Add new patch number below this line */
	54	+ /**/
	55	+ 40,
	56	/**/
	57
	58	--
	59	ARTHUR: Now stand aside worthy adversary.
	60	BLACK KNIGHT: (Glancing at his shoulder) 'Tis but a scratch.
	61	ARTHUR: A scratch? Your arm's off.
	62	"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
	63
	64	/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
65	/// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\
66	\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
67	\\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html ///