Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 7 May 2008 15:59:18 GMT
From:      Sam Leffler <sam@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 141283 for review
Message-ID:  <200805071559.m47FxIMB033755@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=141283

Change 141283 by sam@sam_ebb on 2008/05/07 15:58:57

	fix merge botch

Affected files ...

.. //depot/projects/vap/gnu/usr.bin/sort/config.h#4 edit

Differences ...

==== //depot/projects/vap/gnu/usr.bin/sort/config.h#4 (text+ko) ====

@@ -1240,7 +1240,7 @@
 #define PACKAGE_VERSION "5.3.0-20040812-FreeBSD"
 
 /* the number of pending output bytes on stream `fp' */
-#define PENDING_OUTPUT_N_BYTES __fgetpendout(fp)
+#define PENDING_OUTPUT_N_BYTES fp->_p - fp->_bf._base
 
 /* Define if <inttypes.h> exists and defines unusable PRI* macros. */
 /* #undef PRI_MACROS_BROKEN */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805071559.m47FxIMB033755>