===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -c -r1.53 -r1.54
*** src/usr.bin/tmux/tmux.c	2009/10/26 21:42:04	1.53
--- src/usr.bin/tmux/tmux.c	2009/11/04 12:41:43	1.54
***************
*** 1,4 ****
! /* $OpenBSD: tmux.c,v 1.53 2009/10/26 21:42:04 deraadt Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.c,v 1.54 2009/11/04 12:41:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 31,37 ****
  #include "tmux.h"
  
  #ifdef DEBUG
! const char	*malloc_options = "AFGJPX";
  #endif
  
  volatile sig_atomic_t sigwinch;
--- 31,37 ----
  #include "tmux.h"
  
  #ifdef DEBUG
! extern char	*malloc_options;
  #endif
  
  volatile sig_atomic_t sigwinch;
***************
*** 298,303 ****
--- 298,307 ----
  	void			*buf;
  	size_t			 len;
  	int	 		 nfds, retcode, opt, flags, cmdflags = 0;
+ 
+ #ifdef DEBUG
+ 	malloc_options = (char *) "AFGJPX";
+ #endif
  
  	flags = 0;
  	shellcmd = label = path = NULL;