--- a/UnixOS.st Fri Feb 12 15:55:00 1999 +0100
+++ b/UnixOS.st Fri Feb 12 15:56:39 1999 +0100
@@ -62,15 +62,6 @@
# endif
#endif
-#if defined(__openVMS__) || defined(LINUX)
- /*
- * mhmh - used in stdio ...
- * (new linuxes)
- */
-# undef __new
-# define __NEED_REDEF_new__
-#endif
-
#ifdef LINUX
# define __USE_GNU /* new */
@@ -464,10 +455,6 @@
#endif /* not transputer */
-#ifdef __NEED_REDEF_new__
-# define __new __STX___new
-#endif
-
/*
* on some systems errno is a macro ... check for it here
*/
@@ -5439,13 +5426,21 @@
#ifdef PTY_TEMPL
# include <grp.h>
+# ifdef OLD /* mhmh - suse linux6 places line into rodata ??? */
+ static char line[] = PTY_TEMPL;
+# else
char line[128];
+# endif
register CONST char *cp1, *cp2;
int len, _fdM = -1, _fdS = -1, ttygid;
struct group *gr;
+# ifdef OLD
+ len = sizeof(PTY_TEMPL) - 1;
+# else
strcpy(line, PTY_TEMPL);
len = strlen(line);
+# endif
if ((gr = getgrnam("tty")) != NULL)
ttygid = gr->gr_gid;
@@ -8473,6 +8468,6 @@
!UnixOperatingSystem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Attic/UnixOS.st,v 1.46 1999-02-08 20:36:31 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Attic/UnixOS.st,v 1.47 1999-02-12 14:56:39 cg Exp $'
! !
UnixOperatingSystem initialize!
--- a/UnixOperatingSystem.st Fri Feb 12 15:55:00 1999 +0100
+++ b/UnixOperatingSystem.st Fri Feb 12 15:56:39 1999 +0100
@@ -62,15 +62,6 @@
# endif
#endif
-#if defined(__openVMS__) || defined(LINUX)
- /*
- * mhmh - used in stdio ...
- * (new linuxes)
- */
-# undef __new
-# define __NEED_REDEF_new__
-#endif
-
#ifdef LINUX
# define __USE_GNU /* new */
@@ -464,10 +455,6 @@
#endif /* not transputer */
-#ifdef __NEED_REDEF_new__
-# define __new __STX___new
-#endif
-
/*
* on some systems errno is a macro ... check for it here
*/
@@ -5439,13 +5426,21 @@
#ifdef PTY_TEMPL
# include <grp.h>
+# ifdef OLD /* mhmh - suse linux6 places line into rodata ??? */
+ static char line[] = PTY_TEMPL;
+# else
char line[128];
+# endif
register CONST char *cp1, *cp2;
int len, _fdM = -1, _fdS = -1, ttygid;
struct group *gr;
+# ifdef OLD
+ len = sizeof(PTY_TEMPL) - 1;
+# else
strcpy(line, PTY_TEMPL);
len = strlen(line);
+# endif
if ((gr = getgrnam("tty")) != NULL)
ttygid = gr->gr_gid;
@@ -8473,6 +8468,6 @@
!UnixOperatingSystem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.46 1999-02-08 20:36:31 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.47 1999-02-12 14:56:39 cg Exp $'
! !
UnixOperatingSystem initialize!