* textprop.c (text_property_stickiness): doc fix.

[gnu-emacs] / src / s / sco5.h

diff --git a/src/s/sco5.h b/src/s/sco5.h
index 7d2336b8a945d7c7a1224c4341accf628130e516..06166f32fd99bfe824181915bef9568063489fdc 100644 (file)
--- a/src/s/sco5.h
+++ b/src/s/sco5.h
@@ -1,5 +1,5 @@
 /* System description file for SCO 3.2v5.
-   Copyright (C) 1996  Free Software Foundation, Inc.
+   Copyright (C) 1996, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Mark Diekhans <markd@grizzly.com>.  */
 
@@ -70,7 +70,12 @@ Boston, MA 02111-1307, USA.  */
 /* This is safe since we already assumed HAVE_SOCKET
    if using X windows.  */
 #undef LIBX11_SYSTEM
-#define LIBX11_SYSTEM -lpt -lnls -lnsl -lc -lsocket
+#define LIBX11_SYSTEM_COMMON -lpt -lnls -lnsl -lc -lsocket
+#ifdef MOTIF
+# define LIBX11_SYSTEM -lgen LIBX11_SYSTEM_COMMON
+#else /* ndef MOTIF */
+# define LIBX11_SYSTEM LIBX11_SYSTEM_COMMON
+#endif /* ndef MOTIF */
 
 #undef LIB_X11_LIB
 #define LIB_X11_LIB -lX11
@@ -129,7 +134,11 @@ Boston, MA 02111-1307, USA.  */
 #undef POSIX_SIGNALS
 
 #define SIGMASKTYPE long
+
+#ifndef NOT_C_CODE
 extern SIGMASKTYPE sigprocmask_set;
+#endif /* not NOT_C_CODE */
+
 #define sigblock(sig)                                  \
      (sigprocmask_set = SIGEMPTYMASK | (sig),          \
       sigprocmask (SIG_BLOCK, &sigprocmask_set, NULL))
@@ -141,7 +150,7 @@ extern SIGMASKTYPE sigprocmask_set;
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base)
 #endif
 
-/* Use ELF and get real shared libraries */ 
+/* Use ELF and get real shared libraries */
 
 #undef COFF
 #define ELF
@@ -153,9 +162,6 @@ extern SIGMASKTYPE sigprocmask_set;
 #define LD_SWITCH_SYSTEM -belf
 #endif
 
-/* SCO has a working alloca in libPW */
-#define HAVE_ALLOCA
-
 /* Don't disable static function, as SCO's header files have some.*/
 #undef static
 
@@ -165,3 +171,6 @@ extern SIGMASKTYPE sigprocmask_set;
 #define LIB_STANDARD -lc /usr/ccs/lib/crtn.o
 
 #define NARROWPROTO 1
+
+/* arch-tag: 930541b5-52d9-4cbe-b73c-f4c72091f5df
+   (do not change this comment) */