* 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.

2 files changed, 6 insertions, 16 deletions

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 */
 }