From e8e2fd816b9cc82feb56bea07b19b0d1c63fd521 Mon Sep 17 00:00:00 2001 From: fedor Date: Tue, 9 Feb 1999 05:46:19 +0000 Subject: [PATCH] Bugs git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@3673 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ Headers/gnustep/base/fake-main.h | 10 +--------- Source/NSProcessInfo.m | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ac4bcbf5..f58974430 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1999-02-08 Adam Fedor + + * Source/include/fake-main.h: Leave off __ELF__, only use + autoload of init method if SYS_AUTOLOAD. + * Source/NSProcessInfo.m: Likewise. + Mon Feb 8 10:05:00 1999 Richard Frith-Macdonald * Source/include/NSByteOrder.h: Implemented a full set of byte-swapping diff --git a/Headers/gnustep/base/fake-main.h b/Headers/gnustep/base/fake-main.h index c8c19c332..91391e371 100644 --- a/Headers/gnustep/base/fake-main.h +++ b/Headers/gnustep/base/fake-main.h @@ -36,15 +36,7 @@ functions is implemented in NSProcessInfo.m */ -/* Currently this only actually necessary if we don't have ELF. - If we have ELF, we can do something far cleaner. - See src/NSProcessInfo.m [__ELF__]. - Hopefully, in the future, we'll do something cleaner - with non-ELF systems too. - -mccallum -*/ - -#if (!defined(__ELF__) && !defined(SYS_AUTOLOAD)) || defined(__FreeBSD__) || defined(__PPC__) +#if (!defined(SYS_AUTOLOAD)) || defined(__FreeBSD__) #ifndef __MINGW32__ #define main gnustep_base_user_main extern int gnustep_base_user_main (/* int argc, char *argv[] */); diff --git a/Source/NSProcessInfo.m b/Source/NSProcessInfo.m index fc6732876..89221a7ed 100644 --- a/Source/NSProcessInfo.m +++ b/Source/NSProcessInfo.m @@ -196,7 +196,7 @@ _gnu_process_args(int argc, char *argv[], char *env[]) that it automatically gets called before main with the argument and environment pointers. FIXME: Would like to do something similar for other formats besides ELF. */ -#if ((defined(__ELF__) && !defined(__FreeBSD__) && !defined(__PPC__)) || defined(SYS_AUTOLOAD)) +#if (!defined(__FreeBSD__)) || defined(SYS_AUTOLOAD) #ifdef linux /* Under linux the functions in __libc_subinit are called before the