diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-12-03 10:46:12 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-12-03 10:46:12 +0000 |
commit | 6ebb2f56d57ee2e900954d2264b605353cf44ca2 (patch) | |
tree | 5276c764e098351cbb2bebe9862dbc8ed6955a5b /include/platform.h | |
parent | f8535ccd65d21db9762be8715a6107889a50977f (diff) | |
download | busybox-w32-6ebb2f56d57ee2e900954d2264b605353cf44ca2.tar.gz busybox-w32-6ebb2f56d57ee2e900954d2264b605353cf44ca2.tar.bz2 busybox-w32-6ebb2f56d57ee2e900954d2264b605353cf44ca2.zip |
crond: use bb_setpgrp, not setpgrp
platform.h: make a bit more readable
Diffstat (limited to 'include/platform.h')
-rw-r--r-- | include/platform.h | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/include/platform.h b/include/platform.h index 8657ba478..b8c85dba0 100644 --- a/include/platform.h +++ b/include/platform.h | |||
@@ -78,7 +78,7 @@ | |||
78 | //__attribute__ ((__externally_visible__)) | 78 | //__attribute__ ((__externally_visible__)) |
79 | #else | 79 | #else |
80 | # define EXTERNALLY_VISIBLE | 80 | # define EXTERNALLY_VISIBLE |
81 | #endif /* GNUC >= 4.1 */ | 81 | #endif |
82 | 82 | ||
83 | /* We use __extension__ in some places to suppress -pedantic warnings | 83 | /* We use __extension__ in some places to suppress -pedantic warnings |
84 | about GCC extensions. This feature didn't work properly before | 84 | about GCC extensions. This feature didn't work properly before |
@@ -185,7 +185,7 @@ typedef int socklen_t; | |||
185 | * until userspace is widely fixed. */ | 185 | * until userspace is widely fixed. */ |
186 | #if (defined __INTEL_COMPILER && !defined __GNUC__) || \ | 186 | #if (defined __INTEL_COMPILER && !defined __GNUC__) || \ |
187 | (defined __GNUC__ && defined __STRICT_ANSI__) | 187 | (defined __GNUC__ && defined __STRICT_ANSI__) |
188 | __extension__ typedef __signed__ long long __s64; | 188 | __extension__ typedef long long __s64; |
189 | __extension__ typedef unsigned long long __u64; | 189 | __extension__ typedef unsigned long long __u64; |
190 | #endif | 190 | #endif |
191 | 191 | ||
@@ -296,30 +296,32 @@ static ALWAYS_INLINE char* strchrnul(const char *s, char c) | |||
296 | #endif | 296 | #endif |
297 | 297 | ||
298 | #if (defined __digital__ && defined __unix__) | 298 | #if (defined __digital__ && defined __unix__) |
299 | #include <standards.h> | ||
300 | #define HAVE_STANDARDS_H | ||
301 | #include <inttypes.h> | ||
302 | #define HAVE_INTTYPES_H | ||
303 | #define PRIu32 "u" | ||
304 | 299 | ||
300 | # include <standards.h> | ||
301 | # define HAVE_STANDARDS_H | ||
302 | # include <inttypes.h> | ||
303 | # define HAVE_INTTYPES_H | ||
304 | # define PRIu32 "u" | ||
305 | /* use legacy setpgrp(pid_t,pid_t) for now. move to platform.c */ | 305 | /* use legacy setpgrp(pid_t,pid_t) for now. move to platform.c */ |
306 | #define bb_setpgrp() do { pid_t __me = getpid(); setpgrp(__me,__me); } while (0) | 306 | # define bb_setpgrp() do { pid_t __me = getpid(); setpgrp(__me,__me); } while (0) |
307 | 307 | ||
308 | #if !defined ADJ_OFFSET_SINGLESHOT && defined MOD_CLKA && defined MOD_OFFSET | 308 | # if !defined ADJ_OFFSET_SINGLESHOT && defined MOD_CLKA && defined MOD_OFFSET |
309 | #define ADJ_OFFSET_SINGLESHOT (MOD_CLKA | MOD_OFFSET) | 309 | # define ADJ_OFFSET_SINGLESHOT (MOD_CLKA | MOD_OFFSET) |
310 | #endif | 310 | # endif |
311 | #if !defined ADJ_FREQUENCY && defined MOD_FREQUENCY | 311 | # if !defined ADJ_FREQUENCY && defined MOD_FREQUENCY |
312 | #define ADJ_FREQUENCY MOD_FREQUENCY | 312 | # define ADJ_FREQUENCY MOD_FREQUENCY |
313 | #endif | 313 | # endif |
314 | #if !defined ADJ_TIMECONST && defined MOD_TIMECONST | 314 | # if !defined ADJ_TIMECONST && defined MOD_TIMECONST |
315 | #define ADJ_TIMECONST MOD_TIMECONST | 315 | # define ADJ_TIMECONST MOD_TIMECONST |
316 | #endif | 316 | # endif |
317 | #if !defined ADJ_TICK && defined MOD_CLKB | 317 | # if !defined ADJ_TICK && defined MOD_CLKB |
318 | #define ADJ_TICK MOD_CLKB | 318 | # define ADJ_TICK MOD_CLKB |
319 | #endif | 319 | # endif |
320 | |||
321 | #else /* !__digital__ */ | ||
322 | |||
323 | # define bb_setpgrp() setpgrp() | ||
320 | 324 | ||
321 | #else | ||
322 | #define bb_setpgrp() setpgrp() | ||
323 | #endif | 325 | #endif |
324 | 326 | ||
325 | #if defined(__linux__) | 327 | #if defined(__linux__) |