From 33c40709bffdf1f5295b318177f7fed29cd7b4ff Mon Sep 17 00:00:00 2001
From: Patrik Stridvall <ps@leissner.se>
Date: Thu, 26 Jul 2001 21:43:56 +0000
Subject: [PATCH] - Moved comm related protoypes to the correct .h file. -
 Cleaned up the include section.

---
 dlls/kernel/comm.c | 8 ++++----
 include/winbase.h  | 3 +++
 include/winuser.h  | 3 ---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/kernel/comm.c b/dlls/kernel/comm.c
index 50d716553f6..e0a74cd6b00 100644
--- a/dlls/kernel/comm.c
+++ b/dlls/kernel/comm.c
@@ -33,6 +33,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -58,13 +59,12 @@
 # include <sys/strtio.h>
 #endif
 
-#include "windef.h"
 #include "winbase.h"
-#include "heap.h"
-#include "wine/port.h"
-#include "wine/server.h"
 #include "winerror.h"
+
+#include "wine/server.h"
 #include "file.h"
+#include "heap.h"
 
 #include "debugtools.h"
 
diff --git a/include/winbase.h b/include/winbase.h
index 4b107e7748d..e1a2b9e393b 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -1244,6 +1244,7 @@ BOOL        WINAPI BuildCommDCBAndTimeoutsA(LPCSTR,LPDCB,LPCOMMTIMEOUTS);
 BOOL        WINAPI BuildCommDCBAndTimeoutsW(LPCWSTR,LPDCB,LPCOMMTIMEOUTS);
 #define     BuildCommDCBAndTimeouts WINELIB_NAME_AW(BuildCommDCBAndTimeouts)
 BOOL        WINAPI CancelWaitableTimer(HANDLE);
+BOOL        WINAPI ClearCommBreak(HANDLE);
 BOOL        WINAPI ClearCommError(HANDLE,LPDWORD,LPCOMSTAT);
 BOOL        WINAPI ClearEventLogA(HANDLE,LPCSTR);
 BOOL        WINAPI ClearEventLogW(HANDLE,LPCWSTR);
@@ -1302,6 +1303,7 @@ BOOL        WINAPI DeregisterEventSource(HANDLE);
 BOOL        WINAPI DisableThreadLibraryCalls(HMODULE);
 BOOL        WINAPI DosDateTimeToFileTime(WORD,WORD,LPFILETIME);
 BOOL        WINAPI DuplicateHandle(HANDLE,HANDLE,HANDLE,HANDLE*,DWORD,BOOL,DWORD);
+BOOL        WINAPI EscapeCommFunction(HANDLE,UINT);
 BOOL      WINAPI EnumResourceLanguagesA(HMODULE,LPCSTR,LPCSTR,
                                             ENUMRESLANGPROCA,LONG);
 BOOL      WINAPI EnumResourceLanguagesW(HMODULE,LPCWSTR,LPCWSTR,
@@ -1545,6 +1547,7 @@ DWORD       WINAPI SearchPathA(LPCSTR,LPCSTR,LPCSTR,DWORD,LPSTR,LPSTR*);
 DWORD       WINAPI SearchPathW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPWSTR,LPWSTR*);
 #define     SearchPath WINELIB_NAME_AW(SearchPath)
 BOOL        WINAPI SetCommConfig(HANDLE,LPCOMMCONFIG);
+BOOL        WINAPI SetCommBreak(HANDLE);
 BOOL        WINAPI SetCommMask(HANDLE,DWORD);
 BOOL        WINAPI SetCommState(HANDLE,LPDCB);
 BOOL        WINAPI SetCommTimeouts(HANDLE,LPCOMMTIMEOUTS);
diff --git a/include/winuser.h b/include/winuser.h
index 8caaa63fb94..844d8db2ff4 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -3381,7 +3381,6 @@ BOOL      WINAPI CheckMenuRadioItem(HMENU,UINT,UINT,UINT,UINT);
 BOOL      WINAPI CheckRadioButton(HWND,UINT,UINT,UINT);
 HWND      WINAPI ChildWindowFromPoint(HWND,POINT);
 HWND      WINAPI ChildWindowFromPointEx(HWND,POINT,UINT);
-BOOL      WINAPI ClearCommBreak(HANDLE);
 BOOL      WINAPI ClientToScreen(HWND,LPPOINT);
 BOOL      WINAPI ClipCursor(const RECT*);
 BOOL      WINAPI CloseClipboard(void);
@@ -3531,7 +3530,6 @@ BOOL        WINAPI EnumWindowStationsA(WINSTAENUMPROCA,LPARAM);
 BOOL        WINAPI EnumWindowStationsW(WINSTAENUMPROCW,LPARAM);
 #define     EnumWindowStations WINELIB_NAME_AW(EnumWindowStations)
 BOOL      WINAPI EqualRect(const RECT*,const RECT*);
-BOOL      WINAPI EscapeCommFunction(HANDLE,UINT);
 INT       WINAPI ExcludeUpdateRgn(HDC,HWND);
 #define     ExitWindows(a,b) ExitWindowsEx(EWX_LOGOFF,0xffffffff)
 INT       WINAPI FillRect(HDC,const RECT*,HBRUSH);
@@ -3820,7 +3818,6 @@ LONG        WINAPI SetClassLongW(HWND,INT,LONG);
 WORD        WINAPI SetClassWord(HWND,INT,WORD);
 HANDLE    WINAPI SetClipboardData(UINT,HANDLE);
 HWND      WINAPI SetClipboardViewer(HWND);
-BOOL      WINAPI SetCommBreak(HANDLE);
 HCURSOR   WINAPI SetCursor(HCURSOR);
 BOOL      WINAPI SetCursorPos(INT,INT);
 BOOL      WINAPI SetDeskWallPaper(LPCSTR);