[ros-diffs] [tkreuzer] 46637: merge r46636

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Thu Apr 1 06:24:21 CEST 2010


Author: tkreuzer
Date: Thu Apr  1 06:24:21 2010
New Revision: 46637

URL: http://svn.reactos.org/svn/reactos?rev=46637&view=rev
Log:
merge r46636 

Modified:
    branches/reactos-yarotows/hal/halx86/generic/misc.c

Modified: branches/reactos-yarotows/hal/halx86/generic/misc.c
URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/hal/halx86/generic/misc.c?rev=46637&r1=46636&r2=46637&view=diff
==============================================================================
--- branches/reactos-yarotows/hal/halx86/generic/misc.c [iso-8859-1] (original)
+++ branches/reactos-yarotows/hal/halx86/generic/misc.c [iso-8859-1] Thu Apr  1 06:24:21 2010
@@ -18,6 +18,7 @@
 
 /* PRIVATE FUNCTIONS **********************************************************/
 
+#ifndef _MINIHAL_
 NTSTATUS 
 NTAPI
 HalpOpenRegistryKey(IN PHANDLE KeyHandle,
@@ -58,6 +59,7 @@
     /* We're done */
     return Status;
 }
+#endif
 
 VOID
 NTAPI




More information about the Ros-diffs mailing list