Mercurial > hg > xemacs-beta

comparison src/s/sol2.h @ 5494:861f2601a38b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sync s/ files with GNU 23.1.92, delete obsolete stuff, simplify other stuff --- ChangeLog 2010-02-20 Ben Wing <ben@xemacs.org> * configure: * configure.ac (XE_EXPAND_VARIABLE): * configure.ac (TAB): irix6-0.h renamed to irix6-5.h; sco7.h deleted. bsd4-3.h renamed to bsd-common.h. Simplify setting machine= for intel386, mips. Put back linux.h. Incorporate some stuff about debug/optimization flags in irix6-5.h into configure.ac. Add a comment about LCC stuff with optimization flags that should be fixed up. --- src/ChangeLog 2010-02-20 Ben Wing <ben@xemacs.org> * sysdep.c: * sysdep.c (qxe_reliable_signal): * sysdep.c (retry_open_1): * sysdep.c (retry_close): * sysdep.c (retry_read_1): * sysdep.c (retry_write_1): * sysdep.c (retry_fopen): * sysdep.c (retry_fclose): * sysdep.c (retry_fread): * sysdep.c (retry_fwrite): Remove conditionalization on INTERRUPTIBLE_IO, INTERRUPTIBLE_OPEN, INTERRUPTIBLE_CLOSE -- always check for EINTR as there's no harm in it. Remove old #if 0'ed out SA_RESTART code. Use manifest constant IRIX6_5 instead of IRIX. * Makefile.in.in: * dired.c: * dired.c (Ffile_attributes): Use manifest constant IRIX6_5 instead of IRIX. Eliminate constant BSD4_2, use BSD4_3 instead. * getloadavg.c: * getloadavg.c (getloadavg): * getloadavg.c (LDAV_PRIVILEGED): * getloadavg.c (LDAV_DONE): Sync with GNU 23.1.92. 2010-02-20 Ben Wing <ben@xemacs.org> * s/README: * s/aix4-2.h: * s/aix4-2.h (MAIL_USE_LOCKF): * s/bsd-common.h: * s/freebsd.h: * s/freebsd.h (Carey): * s/freebsd.h (or): * s/gnu.h: * s/gnu.h (DATA_START): * s/hpux11-shr.h: * s/hpux11.h: * s/hpux11.h (random): * s/irix6-5.h: * s/linux.h: * s/mach-bsd4-3.h: * s/netbsd.h: * s/netbsd.h (or): * s/netbsd.h (A_TEXT_OFFSET): * s/netbsd.h (NO_MATHERR): * s/openbsd.h: * s/sol2.h: * s/usg5-4-2.h: * s/usg5-4.h: * s/usg5-4.h (or): * s/usg5-4.h (ORDINARY_LINK): Sync with GNU 23.1.92. Put back linux.h. Rename: bsd4-3.h -> bsd-common.h; irix6-0.h -> irix6-5.h. Delete: template.h (useless). Delete a whole bunch of obsolete stuff in sol2.h, linux.h, freebsd.h -- assume anything over 10 years old is sufficiently obsolete to be deleted. Remove LIBS_DEBUG, C_DEBUG_SWITCH, C_OPTIMIZE_SWITCH, KERNEL_FILE, LDAV_SYMBOL, most remaining PTY stuff, remaining TERMINFO/TERMCAP stuff. Update README appropriately. Remove stuff in hpux11-shr.h duplicated in hpux11.h. Remove sco7.h, identical with usg5-4-2.h. Remove unused POSIX flag, BROKEN_TIOC*, NO_SIOCTL_H. 2010-02-20 Ben Wing <ben@xemacs.org> * m/arm.h: * m/hp800.h: * m/intel386.h: * m/mips.h: * m/powerpc.h: * m/sparc.h: * m/template.h: Temporarily ifdef out all defines involving load-average stuff -- using define ENABLE_SM_FILE_DECLS_OF_LOADAVG_STUFF, which is not defined. I'm pretty sure getloadavg.c will take care of defining stuff properly on all systems without the need to duplicate the info in m/*. --ben Delete LIBS_TERMCAP; configure auto-handles this. Delete extra stuff in hp800.h. Delete C_DEBUG_SWITCH, C_OPTIMIZE_SWITCH, LDAV_SYMBOL; incorporate some stuff into configure.ac.
author Ben Wing <ben@xemacs.org>
date Sat, 20 Feb 2010 06:03:00 -0600
parents 8fea628c26fb
children 1f0b15040456
comparison
equal deleted inserted replaced
5493:f62141fe007d 5494:861f2601a38b
1 /* Synched up with: Completely divergent from FSF. */ 1 /* Synched up with: Completely divergent from FSF. */
2 #define SOLARIS2 1 2 #define SOLARIS2 1
3 #define POSIX 1 3 /* #define POSIX -- not used in XEmacs */
4
5 #ifndef USG
6 #define USG
7 #endif
8
9 #ifndef USG5_4
10 #define USG5_4
11 #endif
12 4
13 /* Fix understandable GCC lossage on Solaris 2.6 */ 5 /* Fix understandable GCC lossage on Solaris 2.6 */
14 #if defined(__GNUC__) && OS_RELEASE >= 506 && OS_RELEASE < 510 && !defined(NOT_C_CODE) 6 #if defined(__GNUC__) && OS_RELEASE >= 506 && OS_RELEASE < 510 && !defined(NOT_C_CODE)
15 7
16 /* GCC va_list munging is a little messed up */ 8 /* GCC va_list munging is a little messed up */
39 #undef PC /* Defined in x86 /usr/include/sys/reg.h */ 31 #undef PC /* Defined in x86 /usr/include/sys/reg.h */
40 32
41 /* SIGIO seems to be working under Solaris and it makes ^G work better... */ 33 /* SIGIO seems to be working under Solaris and it makes ^G work better... */
42 #undef BROKEN_SIGIO 34 #undef BROKEN_SIGIO
43 35
44 /* eggert@twinsun.com said these work in Solaris.
45 Perhaps they work in all kinds of SVR4, but this is more conservative. */
46 #undef BROKEN_TIOCGETC
47 #undef BROKEN_TIOCGWINSZ
48
49 #ifdef NOT_C_CODE 36 #ifdef NOT_C_CODE
50 #define ORDINARY_LINK
51 /* XEmacs change -- some Motif packages need -lgen to get regex and regcmp */ 37 /* XEmacs change -- some Motif packages need -lgen to get regex and regcmp */
52 38
53 #undef LIBS_SYSTEM 39 #undef LIBS_SYSTEM
54 #define LIBS_SYSTEM "-lsocket -lnsl -lelf -lgen -ldl" 40 #define LIBS_SYSTEM "-lsocket -lnsl -lelf -lgen -ldl"
55 41
56 /* SYSTEM_MALLOC must be defined if dbx/RTC is going to be used. dbx/RTC does 42 /* SYSTEM_MALLOC must be defined if dbx/RTC is going to be used. dbx/RTC does
57 not work with a static definition of malloc(). */ 43 not work with a static definition of malloc(). */
58 /* We want to be able to test out ralloc.c. */ 44 /* We want to be able to test out ralloc.c. */
59 /* #define SYSTEM_MALLOC */ 45 /* #define SYSTEM_MALLOC */
60 46
61 /* XEmacs: there used to be a special definition of
62 PTY_TTY_NAME_SPRINTF here that was identical to the
63 other SYSV R4 definitions except that it didn't
64 block SIGCHLD around the call to grantpt(). This
65 is *not* in 19.29 and is almost certainly incorrect.
66 */
67
68 #undef UNEXEC 47 #undef UNEXEC
69 #if OS_RELEASE < 506
70 #define UNEXEC "unexsol2.o"
71 #else
72 #define UNEXEC "unexsol2-6.o" 48 #define UNEXEC "unexsol2-6.o"
73 #endif
74 49
75 #else /* C_CODE */ 50 #else /* C_CODE */
76 51
77 #if OS_RELEASE <= 503
78 /* Solaris 2.3 has a bug in XListFontsWithInfo. */
79 #define BROKEN_XLISTFONTSWITHINFO
80 #endif
81
82 /* XEmacs addition: Raymond Toy says XEmacs completely misses SIGCHLD
83 when compiled with GCC 2.7.0 (but not, apparently, with SunPro C?),
84 X11R6, and Solaris 2.4.
85
86 Someone else submitted a simple test program that duplicates this
87 behavior, and says it has something to do with the fact that X11R6
88 links with the threads library. */
89
90 #ifdef THIS_IS_X11R6
91 #define BROKEN_SIGCHLD
92 #endif
93
94 #if OS_RELEASE < 505
95
96 #if __STDC__ == 1 && defined(__SUNPRO_C)
97 #define _POSIX_C_SOURCE 1
98 #include <setjmp.h>
99 #undef _POSIX_C_SOURCE
100 #endif /* cc -Xc */
101
102 /* Missing prototype, added in Solaris 2.5 */
103 extern void *__builtin_alloca (size_t);
104 #endif /* before SunOS 5.5 */
105
106 #if OS_RELEASE == 505
107 /* The following functions were added in Solaris 2.5,
108 but they forgot to add prototypes to the system header files. */
109 int getpagesize (void);
110 long random (void);
111 void srandom (unsigned int seed);
112 int usleep (unsigned int useconds);
113 #endif /* SunOS 5.5 */
114
115 /* 2.5 now has `random' back in libc but we don't want to use it. */ 52 /* 2.5 now has `random' back in libc but we don't want to use it. */
116 #if OS_RELEASE >= 505
117 #undef HAVE_RANDOM 53 #undef HAVE_RANDOM
118 /* Apparently not necessary here, and it causes 10% CPU chewage. */
119 #undef BROKEN_SIGCHLD
120 #endif /* >= SunOS 5.5 */
121
122 #if OS_RELEASE < 506
123 /* Missing prototypes, added in Solaris 2.6 */
124 struct timeval;
125 int utimes (char *file, struct timeval *tvp);
126 int gethostname (char *name, int namelen);
127 #endif /* before SunOS 5.6 */
128 54
129 #include <sys/utsname.h> /* warning: macro redefined: SYS_NMLN */ 55 #include <sys/utsname.h> /* warning: macro redefined: SYS_NMLN */
130 56
131 /* XEmacs: Solaris has sigsetjmp but using it leads to core dumps at
132 least under 2.4 */
133 #undef _setjmp
134 #define _setjmp setjmp
135
136 #endif /* C_CODE */ 57 #endif /* C_CODE */