circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-25 02:48:47 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 487:

Browse Source 
Change declaration and use of malloc_options to be more standard, from Tim van
der Molen.
This commit is contained in:
Tiago Cunha 2009-11-04 22:49:27 +00:00
parent 9e208584ed
commit c78426f033
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tmux.c
View File

@ -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> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -32,7 +32,7 @@
#ifdef DEBUG #ifdef DEBUG
/* DragonFly uses an OpenBSD-like malloc() since 1.6 */ /* DragonFly uses an OpenBSD-like malloc() since 1.6 */
#if defined(__OpenBSD__) || defined(__DragonFly__) #if defined(__OpenBSD__) || defined(__DragonFly__)
const char *malloc_options = "AFGJPX"; extern char *malloc_options;
#endif #endif
#ifdef __FreeBSD__ #ifdef __FreeBSD__
const char *_malloc_options = "AJX"; const char *_malloc_options = "AJX";
@ -308,6 +308,10 @@ main(int argc, char **argv)
size_t len; size_t len;
int nfds, retcode, opt, flags, cmdflags = 0; int nfds, retcode, opt, flags, cmdflags = 0;
#ifdef DEBUG
malloc_options = (char *) "AFGJPX";
#endif
flags = 0; flags = 0;
shellcmd = label = path = NULL; shellcmd = label = path = NULL;
login_shell = (**argv == '-'); login_shell = (**argv == '-');