You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
39 lines
1.3 KiB
39 lines
1.3 KiB
12 years ago
|
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||
|
|
#
|
||
|
|
# Filename: package/.../musl/pkg_patch/time/time-musl-no-redefinition-of-struct-rusage.patch
|
||
|
|
# Copyright (C) 2012 The OpenSDE Project
|
||
|
|
#
|
||
|
|
# More information can be found in the files COPYING and README.
|
||
|
|
#
|
||
|
|
# This patch file is dual-licensed. It is available under the license the
|
||
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
||
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||
|
|
# of the GNU General Public License as published by the Free Software
|
||
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
||
|
|
# version.
|
||
|
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
||
|
|
|
||
|
|
resuse.h:43:8: error: redefinition of 'struct rusage'
|
||
|
|
|
||
|
|
--- ./resuse.h.orig 2012-11-26 01:54:53.610183362 +0100
|
||
|
|
+++ ./resuse.h 2012-11-26 01:55:14.810683068 +0100
|
||
|
|
@@ -38,17 +38,6 @@
|
||
|
|
# define TV_MSEC tv_usec / 1000
|
||
|
|
# if HAVE_WAIT3
|
||
|
|
# include <sys/resource.h>
|
||
|
|
-# else
|
||
|
|
-/* Process resource usage structure. */
|
||
|
|
-struct rusage
|
||
|
|
-{
|
||
|
|
- struct timeval ru_utime; /* User time used. */
|
||
|
|
- struct timeval ru_stime; /* System time used. */
|
||
|
|
- int ru_maxrss, ru_ixrss, ru_idrss, ru_isrss,
|
||
|
|
- ru_minflt, ru_majflt, ru_nswap, ru_inblock,
|
||
|
|
- ru_oublock, ru_msgsnd, ru_msgrcv, ru_nsignals,
|
||
|
|
- ru_nvcsw, ru_nivcsw;
|
||
|
|
-};
|
||
|
|
# endif
|
||
|
|
#endif
|
||
|
|
|