Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-07 00:53:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Remove an unneeded MSVC block in windef.h and indent the definition of the "min" and "max" macros

Browse source 
- Shuffle the header inclusion order in charmap around, so that it compiles warning-free under MSVC (at /W3)

svn path=/trunk/; revision=32513
This commit is contained in:
Colin Finck 2008-02-27 14:57:47 +00:00
parent 2233f3c7cc
commit 0e419d44d8
2 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/base/applications/charmap/precomp.h
View file

@ -1,7 +1,9 @@
#ifndef __CHARMAP_PRECOMP_H #ifndef __CHARMAP_PRECOMP_H
#define __CHARMAP_PRECOMP_H #define __CHARMAP_PRECOMP_H
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <windows.h>
#include <commctrl.h> #include <commctrl.h>
#include "resource.h" #include "resource.h"

21
reactos/include/psdk/windef.h
View file

@ -160,21 +160,14 @@ extern "C" {
#endif #endif
#endif #endif
#if defined(_MSC_VER) && defined(__cplusplus) #ifndef NOMINMAX
#ifndef max
#include <stdlib.h> #define max(a,b) ((a)>(b)?(a):(b))
#define min __min #endif
#define max __max
#elif !defined(_MSC_VER) && !defined(NOMINMAX)
#ifndef max
#define max(a,b) ((a)>(b)?(a):(b))
#endif
#ifndef min
#define min(a,b) ((a)<(b)?(a):(b))
#endif
#ifndef min
#define min(a,b) ((a)<(b)?(a):(b))
#endif
#endif #endif
#define UNREFERENCED_PARAMETER(P) {(P)=(P);} #define UNREFERENCED_PARAMETER(P) {(P)=(P);}