Index: winsup/cygwin/dcrt0.cc
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/dcrt0.cc,v
retrieving revision 1.400
diff -u -p -r1.400 dcrt0.cc
--- winsup/cygwin/dcrt0.cc	6 Jun 2011 05:02:08 -0000	1.400
+++ winsup/cygwin/dcrt0.cc	6 Jun 2011 10:04:45 -0000
@@ -806,12 +806,6 @@ dll_crt0_1 (void *)
 
   __sinit (_impure_ptr);
 
-#ifdef DEBUGGING
-  {
-  extern void fork_init ();
-  fork_init ();
-  }
-#endif
   pinfo_init (envp, envc);
 
   if (!old_title && GetConsoleTitle (title_buf, TITLESIZE))
Index: winsup/cygwin/fork.cc
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/fork.cc,v
retrieving revision 1.226
diff -u -p -r1.226 fork.cc
--- winsup/cygwin/fork.cc	6 Jun 2011 05:02:11 -0000	1.226
+++ winsup/cygwin/fork.cc	6 Jun 2011 10:04:45 -0000
@@ -685,12 +685,6 @@ fork ()
   syscall_printf ("%d = fork()", res);
   return res;
 }
-#ifdef DEBUGGING
-void
-fork_init ()
-{
-}
-#endif /*DEBUGGING*/
 
 
 extern "C" int
Index: winsup/cygwin/globals.cc
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/globals.cc,v
retrieving revision 1.28
diff -u -p -r1.28 globals.cc
--- winsup/cygwin/globals.cc	6 Jun 2011 05:02:11 -0000	1.28
+++ winsup/cygwin/globals.cc	6 Jun 2011 10:04:47 -0000
@@ -165,8 +165,8 @@ extern "C"
    /* threadinterface */ &_mtinterf,
    /* impure_ptr */ _GLOBAL_REENT,
   };
+  struct per_process * user_data = &__cygwin_user_data;
   bool ignore_case_with_glob;
   int _check_for_executable = true;
 };
-
 int NO_COPY __api_fatal_exit_val = 1;
Index: winsup/cygwin/perprocess.h
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/perprocess.h,v
retrieving revision 1.3
diff -u -p -r1.3 perprocess.h
--- winsup/cygwin/perprocess.h	24 Jun 2001 22:26:52 -0000	1.3
+++ winsup/cygwin/perprocess.h	6 Jun 2011 10:04:47 -0000
@@ -16,7 +16,7 @@ extern "C" {
 
 /* Pointer into application's static data */
 extern struct per_process __cygwin_user_data;
-#define user_data (&__cygwin_user_data)
+extern struct per_process * user_data;
 
 /* We use the following to test that sizeof hasn't changed.  When adding
    or deleting members, insert fillers or use the reserved entries.
Index: winsup/cygwin/pinfo.cc
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/pinfo.cc,v
retrieving revision 1.276
diff -u -p -r1.276 pinfo.cc
--- winsup/cygwin/pinfo.cc	4 Jun 2011 00:29:19 -0000	1.276
+++ winsup/cygwin/pinfo.cc	6 Jun 2011 10:04:47 -0000
@@ -42,9 +42,9 @@ pinfo_basic::pinfo_basic()
   GetModuleFileNameW (NULL, progname, sizeof (progname));
 }
 
-pinfo_basic myself_initial NO_COPY;
+pinfo_basic NO_COPY myself_initial;
 
-pinfo NO_COPY myself (static_cast<_pinfo *> (&myself_initial));	// Avoid myself != NULL checks
+pinfo NO_COPY myself  =  static_cast<_pinfo *> (&myself_initial);	// Avoid myself != NULL checks
 
 bool is_toplevel_proc;