diff options
author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-03-12 14:41:51 +0000 |
---|---|---|
committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-03-12 14:41:51 +0000 |
commit | 0c6c47ecd1fa99971ca6853337fc9cb888bc6049 (patch) | |
tree | 746be177b035fc1d2aa20e66f55cb20addbed929 /hw/xnest/Init.c | |
parent | b1be72c5ca6cb98ba64637990b142be0f1710a19 (diff) | |
parent | ea0598773ec2859df09ae62f027db6ee611f51c0 (diff) |
Merge branch 'cygwin-patches-for-1.12' into cygwin-release-1.12xserver-cygwin-1.12.0-1
Diffstat (limited to 'hw/xnest/Init.c')
-rw-r--r-- | hw/xnest/Init.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c index af57518ba..f6e27c5c5 100644 --- a/hw/xnest/Init.c +++ b/hw/xnest/Init.c @@ -143,9 +143,8 @@ void OsVendorFatalError(void) return; } -#if defined(DDXBEFORERESET) -void ddxBeforeReset(void) +#ifdef DDXMAIN +void ddxMain(void) { - return; } #endif |