2
0
mirror of https://github.com/xcat2/xcat-dep.git synced 2024-11-22 09:31:48 +00:00
xcat-dep/atftp/debian/patches/xcat-debian.diff

34 lines
1.2 KiB
Diff
Raw Normal View History

--- atftp-0.7.dfsg/argz.h.orig 2010-07-14 20:23:20.000000000 -0700
+++ atftp-0.7.dfsg/argz.h 2010-07-14 20:25:11.000000000 -0700
@@ -180,7 +180,7 @@
#ifdef __USE_EXTERN_INLINES
extern inline char *
__argz_next (__const char *__argz, size_t __argz_len,
- __const char *__entry) __THROW
+ __const char *__entry)
{
if (__entry)
{
@@ -194,7 +194,7 @@
}
extern inline char *
argz_next (__const char *__argz, size_t __argz_len,
- __const char *__entry) __THROW
+ __const char *__entry)
{
return __argz_next (__argz, __argz_len, __entry);
}
--- atftp-0.7.dfsg/stats.c.orig 2010-07-14 20:29:49.000000000 -0700
+++ atftp-0.7.dfsg/stats.c 2010-07-14 20:30:22.000000000 -0700
@@ -157,8 +157,8 @@
logger(LOG_INFO, " Load measurements:");
logger(LOG_INFO, " User: %8.3fs Sys:%8.3fs",
- (double)(s_stats.tms.tms_utime) / CLK_TCK,
- (double)(s_stats.tms.tms_stime) / CLK_TCK);
+ (double)(s_stats.tms.tms_utime) / CLOCKS_PER_SEC,
+ (double)(s_stats.tms.tms_stime) / CLOCKS_PER_SEC);
logger(LOG_INFO, " Total:%8.3fs CPU:%8.3f%%",
(double)(tmp.tv_sec + tmp.tv_usec * 1e-6),
(double)(s_stats.tms.tms_utime + s_stats.tms.tms_stime) /