===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/newsyslog/newsyslog.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -c -r1.100 -r1.101
*** src/usr.bin/newsyslog/newsyslog.c	2016/01/11 19:26:04	1.100
--- src/usr.bin/newsyslog/newsyslog.c	2016/06/01 16:57:48	1.101
***************
*** 1,4 ****
! /*	$OpenBSD: newsyslog.c,v 1.100 2016/01/11 19:26:04 tb Exp $	*/
  
  /*
   * Copyright (c) 1999, 2002, 2003 Todd C. Miller <Todd.Miller@courtesan.com>
--- 1,4 ----
! /*	$OpenBSD: newsyslog.c,v 1.101 2016/06/01 16:57:48 tedu Exp $	*/
  
  /*
   * Copyright (c) 1999, 2002, 2003 Todd C. Miller <Todd.Miller@courtesan.com>
***************
*** 71,94 ****
   *
   */
  
! #ifndef CONF
! #define CONF "/etc/newsyslog.conf" /* Configuration file */
! #endif
! #ifndef PIDFILE
! #define PIDFILE "/etc/syslog.pid"
! #endif
! #ifndef COMPRESS
! #define COMPRESS "/usr/bin/compress" /* File compression program */
! #endif
! #ifndef COMPRESS_POSTFIX
! #define COMPRESS_POSTFIX ".Z"
! #endif
! #ifndef STATS_DIR
! #define STATS_DIR "/etc"
! #endif
! #ifndef SENDMAIL
! #define SENDMAIL "/usr/lib/sendmail"
! #endif
  
  #include <sys/param.h>	/* DEV_BSIZE */
  #include <sys/stat.h>
--- 71,82 ----
   *
   */
  
! #define CONF "/etc/newsyslog.conf"
! #define PIDFILE "/var/run/syslog.pid"
! #define COMPRESS "/usr/bin/gzip"
! #define COMPRESS_POSTFIX ".gz"
! #define STATS_DIR "/var/run"
! #define SENDMAIL "/usr/sbin/sendmail"
  
  #include <sys/param.h>	/* DEV_BSIZE */
  #include <sys/stat.h>
***************
*** 1002,1012 ****
  		warn("%s", fname);
  		goto cleanup;
  	}
- #ifdef QUAD_OFF_T
  	if (fscanf(fp, "%lld\n", &osize) != 1) {
- #else
- 	if (fscanf(fp, "%ld\n", &osize) != 1) {
- #endif	/* QUAD_OFF_T */
  		fclose(fp);
  		goto update;
  	}
--- 990,996 ----
***************
*** 1060,1070 ****
  		warn("%s", fname);
  		goto cleanup;
  	}
- #ifdef QUAD_OFF_T
  	fprintf(fp, "%lld\n", (long long)sb.st_size);
- #else
- 	fprintf(fp, "%ld\n", (long)sb.st_size);
- #endif	/* QUAD_OFF_T */
  	fclose(fp);
  
  cleanup:
--- 1044,1050 ----