diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-11-04 22:49:27 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-11-04 22:49:27 +0000 |
| commit | c78426f0330058c1071a8e906ee57f6f8ed4a9f8 (patch) | |
| tree | 273d5105004d71d1b10642cef920435cc0a56994 /tmux.c | |
| parent | 9e208584eda677f58bf20b5fe5475053456affe7 (diff) | |
| download | rtmux-c78426f0330058c1071a8e906ee57f6f8ed4a9f8.tar.gz rtmux-c78426f0330058c1071a8e906ee57f6f8ed4a9f8.tar.bz2 rtmux-c78426f0330058c1071a8e906ee57f6f8ed4a9f8.zip | |
Sync OpenBSD patchset 487:
Change declaration and use of malloc_options to be more standard, from Tim van
der Molen.
Diffstat (limited to 'tmux.c')
| -rw-r--r-- | tmux.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $Id: tmux.c,v 1.182 2009-10-28 23:12:38 tcunha Exp $ */ +/* $OpenBSD: tmux.c,v 1.54 2009/11/04 12:41:43 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -32,7 +32,7 @@ #ifdef DEBUG /* DragonFly uses an OpenBSD-like malloc() since 1.6 */ #if defined(__OpenBSD__) || defined(__DragonFly__) -const char *malloc_options = "AFGJPX"; +extern char *malloc_options; #endif #ifdef __FreeBSD__ const char *_malloc_options = "AJX"; @@ -308,6 +308,10 @@ main(int argc, char **argv) size_t len; int nfds, retcode, opt, flags, cmdflags = 0; +#ifdef DEBUG + malloc_options = (char *) "AFGJPX"; +#endif + flags = 0; shellcmd = label = path = NULL; login_shell = (**argv == '-'); |