aboutsummaryrefslogtreecommitdiffstats
path: root/progress.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2005-01-28 23:00:58 +0000
committerWayne Davison <wayned@samba.org>2005-01-28 23:00:58 +0000
commit8311f1c11e22148d0528da42889d4d555d1e9b3b (patch)
treef0e5ba26145e31d0efc01d4409a383a1e63025f6 /progress.c
parentae2836325f77311fdaaf9f5a82d13fedfa3312bb (diff)
downloadandroid_external_rsync-8311f1c11e22148d0528da42889d4d555d1e9b3b.tar.gz
android_external_rsync-8311f1c11e22148d0528da42889d4d555d1e9b3b.tar.bz2
android_external_rsync-8311f1c11e22148d0528da42889d4d555d1e9b3b.zip
A minor change to the HAVE_GETPGRP code.
Diffstat (limited to 'progress.c')
-rw-r--r--progress.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/progress.c b/progress.c
index 0cb5060a..cda9178b 100644
--- a/progress.c
+++ b/progress.c
@@ -26,6 +26,12 @@ extern int am_server;
#define PROGRESS_HISTORY_SECS 5
+#if GETPGRP_VOID
+#define GETPGRP_ARG
+#else
+#define GETPGRP_ARG 0
+#endif
+
struct progress_history {
struct timeval time;
OFF_T ofs;
@@ -124,13 +130,8 @@ void show_progress(OFF_T ofs, OFF_T size)
return;
#if HAVE_GETPGRP && HAVE_TCGETPGRP
- if (pgrp == -1) {
-# if GETPGRP_VOID
- pgrp = getpgrp();
-# else
- pgrp = getpgrp(0);
-# endif
- }
+ if (pgrp == -1)
+ pgrp = getpgrp(GETPGRP_ARG);
#endif
gettimeofday(&now, NULL);