Revision c227f099 linux-user/syscall_defs.h

b/linux-user/syscall_defs.h
148 148
    struct target_timeval it_value;
149 149
};
150 150

  
151
typedef abi_long a_target_clock;
151
typedef abi_long target_clock_t;
152 152

  
153 153
#define TARGET_HZ 100
154 154

  
155 155
struct target_tms {
156
    a_target_clock tms_utime;
157
    a_target_clock tms_stime;
158
    a_target_clock tms_cutime;
159
    a_target_clock tms_cstime;
156
    target_clock_t tms_utime;
157
    target_clock_t tms_stime;
158
    target_clock_t tms_cutime;
159
    target_clock_t tms_cstime;
160 160
};
161 161

  
162 162
struct target_utimbuf {
......
235 235

  
236 236
typedef struct {
237 237
        int     val[2];
238
} a_kernel_fsid;
238
} kernel_fsid_t;
239 239

  
240 240
struct kernel_statfs {
241 241
	int f_type;
......
245 245
	int f_bavail;
246 246
	int f_files;
247 247
	int f_ffree;
248
        a_kernel_fsid f_fsid;
248
        kernel_fsid_t f_fsid;
249 249
	int f_namelen;
250 250
	int f_spare[6];
251 251
};
......
281 281

  
282 282
typedef struct {
283 283
    abi_ulong sig[TARGET_NSIG_WORDS];
284
} a_target_sigset;
284
} target_sigset_t;
285 285

  
286 286
#ifdef BSWAP_NEEDED
287
static inline void tswap_sigset(a_target_sigset *d, const a_target_sigset *s)
287
static inline void tswap_sigset(target_sigset_t *d, const target_sigset_t *s)
288 288
{
289 289
    int i;
290 290
    for(i = 0;i < TARGET_NSIG_WORDS; i++)
291 291
        d->sig[i] = tswapl(s->sig[i]);
292 292
}
293 293
#else
294
static inline void tswap_sigset(a_target_sigset *d, const a_target_sigset *s)
294
static inline void tswap_sigset(target_sigset_t *d, const target_sigset_t *s)
295 295
{
296 296
    *d = *s;
297 297
}
298 298
#endif
299 299

  
300
static inline void target_siginitset(a_target_sigset *d, abi_ulong set)
300
static inline void target_siginitset(target_sigset_t *d, abi_ulong set)
301 301
{
302 302
    int i;
303 303
    d->sig[0] = set;
......
305 305
        d->sig[i] = 0;
306 306
}
307 307

  
308
void host_to_target_sigset(a_target_sigset *d, const sigset_t *s);
309
void target_to_host_sigset(sigset_t *d, const a_target_sigset *s);
308
void host_to_target_sigset(target_sigset_t *d, const sigset_t *s);
309
void target_to_host_sigset(sigset_t *d, const target_sigset_t *s);
310 310
void host_to_target_old_sigset(abi_ulong *old_sigset,
311 311
                               const sigset_t *sigset);
312 312
void target_to_host_old_sigset(sigset_t *sigset,
......
481 481
#else
482 482
	abi_ulong	_sa_handler;
483 483
#endif
484
	a_target_sigset	sa_mask;
484
	target_sigset_t	sa_mask;
485 485
};
486 486

  
487 487
#else
......
496 496
        abi_ulong _sa_handler;
497 497
        abi_ulong sa_flags;
498 498
        abi_ulong sa_restorer;
499
        a_target_sigset sa_mask;
499
        target_sigset_t sa_mask;
500 500
};
501 501
#endif
502 502

  
503 503
typedef union target_sigval {
504 504
	int sival_int;
505 505
        abi_ulong sival_ptr;
506
} a_target_sigval;
506
} target_sigval_t;
507 507
#if 0
508 508
#if defined (TARGET_SPARC)
509 509
typedef struct {
......
562 562
		struct {
563 563
			pid_t _pid;		/* sender's pid */
564 564
			uid_t _uid;		/* sender's uid */
565
			a_target_sigval _sigval;
565
			target_sigval_t _sigval;
566 566
		} _rt;
567 567

  
568 568
		/* SIGCHLD */
......
570 570
			pid_t _pid;		/* which child */
571 571
			uid_t _uid;		/* sender's uid */
572 572
			int _status;		/* exit code */
573
			a_target_clock _utime;
574
                        a_target_clock _stime;
573
			target_clock_t _utime;
574
                        target_clock_t _stime;
575 575
		} _sigchld;
576 576

  
577 577
		/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
......
585 585
			int _fd;
586 586
		} _sigpoll;
587 587
	} _sifields;
588
} a_target_siginfo;
588
} target_siginfo_t;
589 589

  
590 590
/*
591 591
 * si_code values
......
1623 1623

  
1624 1624
typedef struct {
1625 1625
        int     val[2];
1626
} a_target_fsid;
1626
} target_fsid_t;
1627 1627

  
1628 1628
#ifdef TARGET_MIPS
1629 1629
#ifdef TARGET_ABI_MIPSN32
......
1638 1638
	int32_t			f_bavail;
1639 1639

  
1640 1640
	/* Linux specials */
1641
	a_target_fsid		f_fsid;
1641
	target_fsid_t		f_fsid;
1642 1642
	int32_t			f_namelen;
1643 1643
	int32_t			f_spare[6];
1644 1644
};
......
1654 1654
	abi_long		f_bavail;
1655 1655

  
1656 1656
	/* Linux specials */
1657
	a_target_fsid		f_fsid;
1657
	target_fsid_t		f_fsid;
1658 1658
	abi_long		f_namelen;
1659 1659
	abi_long		f_spare[6];
1660 1660
};
......
1670 1670
	uint64_t	f_files;
1671 1671
	uint64_t	f_ffree;
1672 1672
	uint64_t	f_bavail;
1673
	a_target_fsid	f_fsid;
1673
	target_fsid_t	f_fsid;
1674 1674
	uint32_t	f_namelen;
1675 1675
	uint32_t	f_spare[6];
1676 1676
};
......
1684 1684
	abi_long f_bavail;
1685 1685
	abi_long f_files;
1686 1686
	abi_long f_ffree;
1687
	a_target_fsid f_fsid;
1687
	target_fsid_t f_fsid;
1688 1688
	abi_long f_namelen;
1689 1689
	abi_long f_frsize;
1690 1690
	abi_long f_spare[5];
......
1698 1698
	abi_long f_bavail;
1699 1699
	abi_long f_files;
1700 1700
	abi_long f_ffree;
1701
	a_target_fsid f_fsid;
1701
	target_fsid_t f_fsid;
1702 1702
	abi_long f_namelen;
1703 1703
	abi_long f_frsize;
1704 1704
	abi_long f_spare[5];
......
1712 1712
	uint32_t f_bavail;
1713 1713
	uint32_t f_files;
1714 1714
	uint32_t f_ffree;
1715
	a_target_fsid f_fsid;
1715
	target_fsid_t f_fsid;
1716 1716
	uint32_t f_namelen;
1717 1717
	uint32_t f_frsize;
1718 1718
	uint32_t f_spare[5];
......
1726 1726
	uint64_t f_bavail;
1727 1727
	uint64_t f_files;
1728 1728
	uint64_t f_ffree;
1729
	a_target_fsid f_fsid;
1729
	target_fsid_t f_fsid;
1730 1730
        uint32_t f_namelen;
1731 1731
	uint32_t f_frsize;
1732 1732
	uint32_t f_spare[5];

Also available in: Unified diff