diff options
| author | Wayne Davison <wayned@samba.org> | 2005-01-28 18:50:49 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2005-01-28 18:50:49 +0000 |
| commit | 25ff04417e4b4fa0aeb44e0b1576a01021aa1650 (patch) | |
| tree | 33747a607367dd1dd54d014d4e17a81e239de6bd /util.c | |
| parent | 63ecee4d1ae76134d3ebd6272d2157f059b2cab6 (diff) | |
| download | android_external_rsync-25ff04417e4b4fa0aeb44e0b1576a01021aa1650.tar.gz android_external_rsync-25ff04417e4b4fa0aeb44e0b1576a01021aa1650.tar.bz2 android_external_rsync-25ff04417e4b4fa0aeb44e0b1576a01021aa1650.zip | |
Use "#if" (not "#ifdef") for configure-defined macros.
Diffstat (limited to 'util.c')
| -rw-r--r-- | util.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -140,12 +140,12 @@ int set_modtime(char *fname, time_t modtime) return 0; { -#ifdef HAVE_UTIMBUF +#if HAVE_UTIMBUF struct utimbuf tbuf; tbuf.actime = time(NULL); tbuf.modtime = modtime; return utime(fname,&tbuf); -#elif defined(HAVE_UTIME) +#elif HAVE_UTIME time_t t[2]; t[0] = time(NULL); t[1] = modtime; @@ -502,7 +502,7 @@ static void glob_expand_one(char *s, char ***argv_ptr, int *argc_ptr, char **argv = *argv_ptr; int argc = *argc_ptr; int maxargs = *maxargs_ptr; -#if !(defined(HAVE_GLOB) && defined(HAVE_GLOB_H)) +#if !(HAVE_GLOB && HAVE_GLOB_H) if (argc == maxargs) { maxargs += MAX_ARGS; if (!(argv = realloc_array(argv, char *, maxargs))) @@ -1094,7 +1094,7 @@ char *timestring(time_t t) static char TimeBuf[200]; struct tm *tm = localtime(&t); -#ifdef HAVE_STRFTIME +#if HAVE_STRFTIME strftime(TimeBuf, sizeof TimeBuf - 1, "%Y/%m/%d %H:%M:%S", tm); #else strlcpy(TimeBuf, asctime(tm), sizeof TimeBuf); |