diff options
| author | Christopher Faylor <me@cgf.cx> | 2008-07-27 16:59:07 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2008-07-27 16:59:07 +0000 |
| commit | b58e5f427a6905c1cefb2205c2359eef177dfb3a (patch) | |
| tree | 8644077567038d8e7847f3c9b265586a26253e3a | |
| parent | 34aa62035b0630a6d6fae9f577f10d5d191c5bb6 (diff) | |
| download | cygnal-b58e5f427a6905c1cefb2205c2359eef177dfb3a.tar.gz cygnal-b58e5f427a6905c1cefb2205c2359eef177dfb3a.tar.bz2 cygnal-b58e5f427a6905c1cefb2205c2359eef177dfb3a.zip | |
* mount.cc (mount_info::init): Add location where we're looking for fstab to
temporary message.
* lib/cygwin_crt0.c (cygwin_crt0): Simplify by eliminating accommodations for
ancient cygwin DLLs.
* lib/crt0.h: Include <windows.h> directly since it is needed.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 9 | ||||
| -rw-r--r-- | winsup/cygwin/lib/crt0.h | 3 | ||||
| -rw-r--r-- | winsup/cygwin/lib/cygwin_crt0.c | 19 | ||||
| -rw-r--r-- | winsup/cygwin/mount.cc | 2 |
4 files changed, 16 insertions, 17 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 125e5a4ea..6bc80e9bf 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,14 @@ 2008-07-27 Christopher Faylor <me+cygwin@cgf.cx> + * mount.cc (mount_info::init): Add location where we're looking for + fstab to temporary message. + + * lib/cygwin_crt0.c (cygwin_crt0): Simplify by eliminating + accommodations for ancient cygwin DLLs. + * lib/crt0.h: Include <windows.h> directly since it is needed. + +2008-07-27 Christopher Faylor <me+cygwin@cgf.cx> + * shared_info.h (shared_destroy): Declare. * shared.cc (shared_destroy): Define new function to destroy shared memory regions. diff --git a/winsup/cygwin/lib/crt0.h b/winsup/cygwin/lib/crt0.h index 7bd240622..461ea9b2e 100644 --- a/winsup/cygwin/lib/crt0.h +++ b/winsup/cygwin/lib/crt0.h @@ -1,6 +1,6 @@ /* crt0.h: header file for crt0. - Copyright 2000, 2001 Red Hat, Inc. + Copyright 2000, 2001, 2008 Red Hat, Inc. This file is part of Cygwin. @@ -12,6 +12,7 @@ details. */ extern "C" { #endif +#include <windows.h> struct per_process; typedef int (*MainFunc) (int argc, char *argv[], char **env); int __stdcall _cygwin_crt0_common (MainFunc, struct per_process *); diff --git a/winsup/cygwin/lib/cygwin_crt0.c b/winsup/cygwin/lib/cygwin_crt0.c index 8dce9f489..fdd2d8d5f 100644 --- a/winsup/cygwin/lib/cygwin_crt0.c +++ b/winsup/cygwin/lib/cygwin_crt0.c @@ -9,27 +9,16 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #undef __INSIDE_CYGWIN__ -#include <windows.h> -#include <time.h> /* Needed since call to sys/time.h via sys/cygwin.h - complains otherwise */ #include <sys/cygwin.h> -#include <stdlib.h> #include "crt0.h" -extern void dll_crt0__FP11per_process (struct per_process *) __declspec (dllimport) __attribute ((noreturn)); +extern void __stdcall _dll_crt0 () + __declspec (dllimport) __attribute ((noreturn)); /* for main module */ void cygwin_crt0 (MainFunc f) { - struct per_process *u; - if (_cygwin_crt0_common (f, NULL)) - u = NULL; /* Newer DLL. Use DLL internal per_process. */ - else /* Older DLL. Provide a per_process */ - { - u = (struct per_process *) alloca (sizeof (*u)); - memset (u, 0, sizeof (u)); - (void) _cygwin_crt0_common (f, u); - } - dll_crt0__FP11per_process (u); /* Jump into the dll, never to return */ + _cygwin_crt0_common (f, NULL); + _dll_crt0 (); /* Jump into the dll, never to return */ } diff --git a/winsup/cygwin/mount.cc b/winsup/cygwin/mount.cc index 2f800acad..55b276193 100644 --- a/winsup/cygwin/mount.cc +++ b/winsup/cygwin/mount.cc @@ -114,7 +114,7 @@ mount_info::init () return; /* FIXME: Remove warning message before releasing 1.7.0. */ - small_printf ("Huh? No /etc/fstab file? Using default root and cygdrive prefix...\n"); + small_printf ("Huh? No /etc/fstab file in %W? Using default root and cygdrive prefix...\n", path); } static void |