8 files changed, 17 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 4504739928b..e3b546d32f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2012-07-10  Glenn Morris  <rgm@gnu.org>
 
-        * configure.ac (DATA_START, DATA_SEG_BITS): Move here from src/s.
+        * configure.ac (DATA_START, DATA_SEG_BITS, PENDING_OUTPUT_COUNT):
+        Move here from src/s.
 
 2012-07-09  Andreas Schwab  <schwab@linux-m68k.org>
 
diff --git a/configure.ac b/configure.ac
index 20b149f58e2..028706af8e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3154,7 +3154,19 @@ AH_TEMPLATE(DATA_SEG_BITS, [Extra bits to be or'd in with any pointers
 stored in a Lisp_Object.])
 dnl if Emacs uses fewer than 32 bits for the value field of a LISP_OBJECT.
 
+dnl Used in dispnew.c
+AH_TEMPLATE(PENDING_OUTPUT_COUNT, [Number of chars of output in the
+buffer of a stdio stream.])
+
 case $opsys in
+  cygwin | darwin | freebsd | netbsd | openbsd )
+    AC_DEFINE(PENDING_OUTPUT_COUNT(FILE), [((FILE)->_p - (FILE)->_bf._base)])
+    ;;
+
+  unixware)
+    AC_DEFINE(PENDING_OUTPUT_COUNT(FILE), [((FILE)->__ptr - (FILE)->__base)])
+    ;;
+
   gnu)
     dnl libc defines data_start.
     AC_DEFINE(DATA_START, [({ extern int data_start; (char *) &data_start; })])
diff --git a/src/ChangeLog b/src/ChangeLog
index cbfc1245c13..de0f729f915 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -11,6 +11,9 @@
 
 2012-07-10  Glenn Morris  <rgm@gnu.org>
 
+        * s/cygwin.h, s/darwin.h, s/freebsd.h, s/netbsd.h, s/unixware.h:
+        Move PENDING_OUTPUT_COUNT definition to configure.
+
         * s/irix6-5.h (DATA_START, DATA_SEG_BITS):
         * s/hpux10-20.h (DATA_SEG_BITS, DATA_START):
         * s/gnu.h (DATA_START): Move definitions to configure.
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 9b437341324..0bbdab0cca1 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -74,8 +74,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Used in various places to enable cygwin-specific code changes.  */
 #define CYGWIN 1
 
-#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
-
 #define HAVE_SOCKETS
 
 /* Emacs supplies its own malloc, but glib (part of Gtk+) calls
diff --git a/src/s/darwin.h b/src/s/darwin.h
index b042630ee91..6b3e680c5d9 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -92,9 +92,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    also the name of a Mach system call.  */
 #define init_process emacs_init_process
 
-/* Used in dispnew.c.  Copied from freebsd.h. */
-#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
-
 /* System uses OXTABS instead of the expected TAB3.  (Copied from bsd386.h.)  */
 #define TAB3 OXTABS
 
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index 05be07695cb..04e9a19bdf8 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -23,8 +23,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Get most of the stuff from bsd-common */
 #include "bsd-common.h"
 
-#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
-
 /* This silences a few compilation warnings.  */
 #undef BSD_SYSTEM
 #if __FreeBSD__ == 1
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index ce3b2afa1bb..23e72541920 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -21,8 +21,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Get most of the stuff from bsd-common.  */
 #include "bsd-common.h"
 
-#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
-
 #define DEFAULT_SOUND_DEVICE "/dev/audio"
 
 /* Greg A. Woods <woods@weird.com> says we must include signal.h
diff --git a/src/s/unixware.h b/src/s/unixware.h
index 1f35287f6d1..e9ebb63f30a 100644
--- a/src/s/unixware.h
+++ b/src/s/unixware.h
@@ -44,8 +44,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
     pty_name[sizeof(pty_name) - 1] = 0;         \
   }
 
-#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base)
-
 /* Conservative garbage collection has not been tested, so for now
    play it safe and stick with the old-fashioned way of marking.  */
 #define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE