[CALC]

* Remove one time inclusions from the main header and put them back where they belong.
* Cleanup the main header.
CORE-7716

svn path=/trunk/; revision=61527

diff --git a/reactos/base/applications/calc/calc.h b/reactos/base/applications/calc/calc.h
index 8b0c0c3..905d074 100644 (file)
--- a/reactos/base/applications/calc/calc.h
+++ b/reactos/base/applications/calc/calc.h
@@ -1,19 +1,13 @@
 #include <stdarg.h>
 #include <windef.h>
-#include <winbase.h>
 #include <winuser.h>
-#include <wingdi.h>
-#include <winreg.h>
 #include <tchar.h>
-//#include <stdio.h>
-//#include <string.h>
 #include <math.h>
 #include <float.h>
 #include <malloc.h>
 #ifndef DISABLE_HTMLHELP_SUPPORT
 #include <htmlhelp.h>
 #endif
-#include <limits.h>
 
 /* Messages reserved for the main dialog */
 #define WM_CLOSE_STATS      (WM_APP+1)
@@ -160,7 +154,6 @@ typedef struct {
 
 extern calc_t calc;
 
-//
 #define CALC_E      2.7182818284590452354
 
 #define CALC_PI_2   1.57079632679489661923
@@ -223,18 +216,12 @@ int  rpn_is_zero(calc_number_t *c);
 void rpn_alloc(calc_number_t *c);
 void rpn_free(calc_number_t *c);
 
-//
-
 void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base);
 void convert_text2number_2(calc_number_t *a);
 void convert_real_integer(unsigned int base);
 
-//
-
 INT_PTR CALLBACK AboutDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp);
 
-//
-
 void ConvExecute(HWND hWnd);
 void ConvAdjust(HWND hWnd, int n_cat);
 void ConvInit(HWND hWnd);

diff --git a/reactos/base/applications/calc/function.c b/reactos/base/applications/calc/function.c
index 82bd6f4..b5f4ab8 100644 (file)
--- a/reactos/base/applications/calc/function.c
+++ b/reactos/base/applications/calc/function.c
@@ -1,5 +1,7 @@
 #include "calc.h"
 
+#include <limits.h>
+
 void apply_int_mask(calc_number_t *r)
 {
     unsigned __int64 mask;

diff --git a/reactos/base/applications/calc/winmain.c b/reactos/base/applications/calc/winmain.c
index e9a82c8..8944790 100644 (file)
--- a/reactos/base/applications/calc/winmain.c
+++ b/reactos/base/applications/calc/winmain.c
@@ -1,5 +1,9 @@
 #include "calc.h"
 
+#include <winbase.h>
+#include <wingdi.h>
+#include <winreg.h>
+
 #define HTMLHELP_PATH(_pt)  TEXT("%systemroot%\\Help\\calc.chm::") TEXT(_pt)
 
 #define MAKE_BITMASK4(_show_b16, _show_b10, _show_b8, _show_b2) \