1 files changed, 4 insertions, 94 deletions
diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h
index 29eca9dcc..714955a5a 100644
--- a/winsup/cygwin/winsup.h
+++ b/winsup/cygwin/winsup.h
@@ -93,99 +93,8 @@ extern HANDLE hMainProc;
 
 /********************** Application Interface **************************/
 
-/* This lives in the app and is initialized before jumping into the DLL.
-   It should only contain stuff which the user's process needs to see, or
-   which is needed before the user pointer is initialized, or is needed to
-   carry inheritance information from parent to child.  Note that it cannot
-   be used to carry inheritance information across exec!
-
-   Remember, this structure is linked into the application's executable.
-   Changes to this can invalidate existing executables, so we go to extra
-   lengths to avoid having to do it.
-
-   When adding/deleting members, remember to adjust {public,internal}_reserved.
-   The size of the class shouldn't change [unless you really are prepared to
-   invalidate all existing executables].  The program does a check (using
-   SIZEOF_PER_PROCESS) to make sure you remember to make the adjustment.
-*/
-
-class per_process
-{
- public:
-  char *initial_sp;
-
-  /* The offset of these 3 values can never change. */
-  /* magic_biscuit is the size of this class and should never change. */
-  DWORD magic_biscuit;
-  DWORD dll_major;
-  DWORD dll_minor;
-
-  struct _reent **impure_ptr_ptr;
-  char ***envptr;
-
-  /* Used to point to the memory machine we should use.  Usually these
-     point back into the dll, but they can be overridden by the user. */
-  void *(*malloc)(size_t);
-  void (*free)(void *);
-  void *(*realloc)(void *, size_t);
-
-  int *fmode_ptr;
-
-  int (*main)(int, char **, char **);
-  void (**ctors)(void);
-  void (**dtors)(void);
-
-  /* For fork */
-  void *data_start;
-  void *data_end;
-  void *bss_start;
-  void *bss_end;
-
-  void *(*calloc)(size_t, size_t);
-  /* For future expansion of values set by the app. */
-  void (*premain[4]) (int, char **);
-
-  /* The rest are *internal* to cygwin.dll.
-     Those that are here because we want the child to inherit the value from
-     the parent (which happens when bss is copied) are marked as such. */
-
-  /* non-zero of ctors have been run.  Inherited from parent. */
-  int run_ctors_p;
-
-  /* These will be non-zero if the above (malloc,free,realloc) have been
-     overridden. */
-  /* FIXME: not currently used */
-  int __imp_malloc;
-  int __imp_free;
-  int __imp_realloc;
-
-  /* Heap management.  Inherited from parent. */
-  void *heapbase;		/* bottom of the heap */
-  void *heapptr;		/* current index into heap */
-  void *heaptop;		/* current top of heap */
-
-  HANDLE unused1;		/* unused */
-
-  /* Non-zero means the task was forked.  The value is the pid.
-     Inherited from parent. */
-  int forkee;
-
-  HMODULE hmodule;
-
-  DWORD api_major;		/* API version that this program was */
-  DWORD api_minor;		/*  linked with */
-  /* For future expansion, so apps won't have to be relinked if we
-     add an item. */
-#ifdef _MT_SAFE
-  ResourceLocks *resourcelocks;
-  MTinterface *threadinterface;
-  void *internal_reserved[6];
-#else
-  void *internal_reserved[8];
-#endif
-};
-
-extern per_process *user_data; /* Pointer into application's static data */
+extern "C" per_process __cygwin_user_data; /* Pointer into application's static data */
+#define user_data (&__cygwin_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.
@@ -363,9 +272,10 @@ extern unsigned int signal_shift_subtract;
 
 /* cygwin .dll initialization */
 void dll_crt0 (per_process *);
+void __stdcall dll_crt0 () __asm__ ("dll_crt0");
 
 /* dynamically loaded dll initialization */
-extern "C" int dll_dllcrt0 (HMODULE,per_process*);
+extern "C" int dll_dllcrt0 (HMODULE, per_process*);
 
 /* dynamically loaded dll initialization for non-cygwin apps */
 extern "C" int dll_noncygwin_dllcrt0 (HMODULE, per_process *);