Subject: bug#6382: 24.0.50; Fix build on platforms including s/usg5-4.h after BSTRING change

From: Lawrence Mitchell <[email-masked]>
Date: Wed, 09 Jun 2010 12:14:19 +0100

This change:

2010-06-06  Dan Nicolaescu  <[email-masked]>

	Remove BSTRING related code, all platforms define it.

Breaks builds on systems that include src/s/usg5-4.h.  The
patch below fixes things.

Cheers,
Lawrence

2010-6-09  Lawrence Mitchell  <[email-masked]>

           * s/usg5-4.h: Remove spurious #ifdef HAVE_X_WINDOWS.

diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index b3518d7..e667ffd 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -61,9 +61,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* The docs for system V/386 suggest v.3 has sigpause, so let's try it.  */
 #define HAVE_SYSV_SIGPAUSE
 
-/* If we're using the System V X port, BSD bstring functions will be handy.  */
-#ifdef HAVE_X_WINDOWS
-
 /* On USG systems signal handlers return void.  */
 #define SIGTYPE void