From fdda6ef8bd181eded1b4b94641dd8890a3d542f1 Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Wed, 4 Nov 2009 23:09:09 +0000
Subject: [PATCH] Adjust OpenBSD patchset 487 to the portable version, and
 while there drop malloc_options on DragonFlyBSD, and FreeBSD.

---
 tmux.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/tmux.c b/tmux.c
index 96e03cd7..075ee788 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.54 2009/11/04 12:41:43 nicm Exp $ */
+/* $Id: tmux.c,v 1.184 2009-11-04 23:09:09 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -29,15 +29,9 @@
 
 #include "tmux.h"
 
-#ifdef DEBUG
-/* DragonFly uses an OpenBSD-like malloc() since 1.6 */
-#if defined(__OpenBSD__) || defined(__DragonFly__)
+#if defined(DEBUG) && defined(__OpenBSD__)
 extern char	*malloc_options;
 #endif
-#ifdef __FreeBSD__
-const char	*_malloc_options = "AJX";
-#endif
-#endif
 
 volatile sig_atomic_t sigwinch;
 volatile sig_atomic_t sigterm;
@@ -308,7 +302,7 @@ main(int argc, char **argv)
 	size_t			 len;
 	int	 		 nfds, retcode, opt, flags, cmdflags = 0;
 
-#ifdef DEBUG
+#if defined(DEBUG) && defined(__OpenBSD__)
 	malloc_options = (char *) "AFGJPX";
 #endif