Synchronize with trunk.

[reactos.git] / win32ss / user / winsrv / consrv / settings.c

diff --git a/win32ss/user/consrv/settings.c b/win32ss/user/winsrv/consrv/settings.c
similarity index 99%
rename from win32ss/user/consrv/settings.c
rename to win32ss/user/winsrv/consrv/settings.c
index 468eebe..738d5bf 100644 (file)
--- a/win32ss/user/consrv/settings.c
+++ b/win32ss/user/winsrv/consrv/settings.c
@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Console Server DLL
- * FILE:            win32ss/user/consrv/settings.c
+ * FILE:            win32ss/user/winsrv/consrv/settings.c
  * PURPOSE:         Console settings management
  * PROGRAMMERS:     Johannes Anderwald
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
@@ -11,7 +11,7 @@
 
 #include "consrv.h"
 #include "include/conio.h"
-#include "conio.h"
+#include "include/conio2.h"
 #include "include/settings.h"
 
 #include <stdio.h> // for swprintf