diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-10-25 00:37:10 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-10-25 00:37:10 +0000 |
commit | 4bbe4e2185c5484328182720ff7b3bb4f9593bff (patch) | |
tree | cd67e40a74928c0f58d4f5b79d2e260e4099fee7 /libc/gmon | |
parent | 91b4be71461f78cabe1fb5f164cea71b60e9e98a (diff) |
Merge changes between r15223 and r15532 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@15545 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/gmon')
-rw-r--r-- | libc/gmon/gmon.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libc/gmon/gmon.c b/libc/gmon/gmon.c index af2ac1c0f..0d2ed0594 100644 --- a/libc/gmon/gmon.c +++ b/libc/gmon/gmon.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1983, 1992, 1993 + * Copyright (c) 1983, 1992, 1993, 2011 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -36,6 +36,7 @@ #include <stdio.h> #include <fcntl.h> #include <unistd.h> +#include <wchar.h> #include <stdio.h> #include <stdlib.h> @@ -45,9 +46,6 @@ #include <libc-internal.h> #include <not-cancel.h> -#ifdef USE_IN_LIBIO -# include <wchar.h> -#endif /* Head of basic-block list or NULL. */ struct __bb *__bb_head attribute_hidden; @@ -194,7 +192,7 @@ write_hist (fd) char dimen_abbrev; } thdr; struct iovec iov[3] = - { + { { &tag, sizeof (tag) }, { &thdr, sizeof (struct gmon_hist_hdr) }, { _gmonparam.kcount, _gmonparam.kcountsize } |