Wed May 27 12:20:37 2009 UTC ()
Use correct linux_clock_t type for _stime, not native clock_t.


(njoly)
diff -r1.4 -r1.5 src/sys/compat/linux/arch/amd64/linux_siginfo.h

cvs diff -r1.4 -r1.5 src/sys/compat/linux/arch/amd64/linux_siginfo.h (expand / switch to unified diff)

--- src/sys/compat/linux/arch/amd64/linux_siginfo.h 2008/11/23 23:48:48 1.4
+++ src/sys/compat/linux/arch/amd64/linux_siginfo.h 2009/05/27 12:20:37 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: linux_siginfo.h,v 1.4 2008/11/23 23:48:48 njoly Exp $ */ 1/* $NetBSD: linux_siginfo.h,v 1.5 2009/05/27 12:20:37 njoly Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. 4 * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 3. All advertising materials mentioning features or use of this software 14 * 3. All advertising materials mentioning features or use of this software
@@ -59,27 +59,27 @@ struct linux_siginfo { @@ -59,27 +59,27 @@ struct linux_siginfo {
59 struct { 59 struct {
60 linux_timer_t _tid; 60 linux_timer_t _tid;
61 int _overrun; 61 int _overrun;
62 char _pad[sizeof(linux_uid_t) - sizeof(int)]; 62 char _pad[sizeof(linux_uid_t) - sizeof(int)];
63 linux_sigval_t _sigval; 63 linux_sigval_t _sigval;
64 int _sys_private; 64 int _sys_private;
65 } _timer; 65 } _timer;
66 66
67 struct { 67 struct {
68 linux_pid_t _pid; 68 linux_pid_t _pid;
69 linux_uid_t _uid; 69 linux_uid_t _uid;
70 int _status; 70 int _status;
71 linux_clock_t _utime; 71 linux_clock_t _utime;
72 clock_t _stime; 72 linux_clock_t _stime;
73 } _sigchld; 73 } _sigchld;
74 74
75 struct { 75 struct {
76 void *_addr; 76 void *_addr;
77 } _sigfault; 77 } _sigfault;
78 78
79 struct { 79 struct {
80 long _band; 80 long _band;
81 int _fd; 81 int _fd;
82 } _sigpoll; 82 } _sigpoll;
83 } _sifields; 83 } _sifields;
84} linux_siginfo_t; 84} linux_siginfo_t;
85 85