diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2012-03-08 09:36:11 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2012-03-08 09:36:11 +0000 |
| commit | 75543537a16a0911af61045a96926cdb81f51383 (patch) | |
| tree | 34fa443cb5d7c48e058d17cb2605e10d3947b521 /winsup/cygwin/sysconf.cc | |
| parent | 106833e9b360c8f56e465e2e80141a13dc193635 (diff) | |
| download | cygnal-75543537a16a0911af61045a96926cdb81f51383.tar.gz cygnal-75543537a16a0911af61045a96926cdb81f51383.tar.bz2 cygnal-75543537a16a0911af61045a96926cdb81f51383.zip | |
* Throughout, replace usage of w32api's min with MIN from sys/param.h.
Diffstat (limited to 'winsup/cygwin/sysconf.cc')
| -rw-r--r-- | winsup/cygwin/sysconf.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/winsup/cygwin/sysconf.cc b/winsup/cygwin/sysconf.cc index f5bfe60d1..1014d4f5a 100644 --- a/winsup/cygwin/sysconf.cc +++ b/winsup/cygwin/sysconf.cc @@ -1,7 +1,7 @@ /* sysconf.cc Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2009, 2010, 2011 Red Hat, Inc. + 2006, 2007, 2009, 2010, 2011, 2012 Red Hat, Inc. This file is part of Cygwin. @@ -11,6 +11,7 @@ details. */ #include "winsup.h" #include <unistd.h> +#include <sys/param.h> #include <sys/sysinfo.h> #include "cygerrno.h" #include "security.h" @@ -294,7 +295,7 @@ confstr (int in, char *buf, size_t len) if (csa[in].l && len) { buf[0] = 0; - strncat (buf, csa[in].s, min (len, csa[in].l) - 1); + strncat (buf, csa[in].s, MIN (len, csa[in].l) - 1); } return csa[in].l; } |