Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
56539394
Commit
56539394
authored
May 07, 2001
by
Francois Gouget
Committed by
Alexandre Julliard
May 07, 2001
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added the minmax.h header (VC6).
Added support for NOMINMAX. Remove __min/__max from windef.h, they belong to (msvcrt/)stdlib.h.
parent
b7175dfb
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
4 deletions
+21
-4
codepage.c
graphics/x11drv/codepage.c
+1
-1
Makefile.in
include/Makefile.in
+1
-0
minmax.h
include/minmax.h
+17
-0
windef.h
include/windef.h
+2
-3
No files found.
graphics/x11drv/codepage.c
View file @
56539394
...
...
@@ -576,7 +576,7 @@ static void X11DRV_GetTextMetricsA_cp932( fontObject* pfo, LPTEXTMETRICA pTM )
if
(
pfo_ansi
!=
NULL
)
{
pTM
->
tmAveCharWidth
=
floor
((
pfo_ansi
->
foAvgCharWidth
*
2
.
0
+
pfo
->
foAvgCharWidth
)
/
3
.
0
*
pfo
->
rescale
+
0
.
5
);
pTM
->
tmMaxCharWidth
=
__
max
(
pfo_ansi
->
foMaxCharWidth
,
pfo
->
foMaxCharWidth
)
*
pfo
->
rescale
;
pTM
->
tmMaxCharWidth
=
max
(
pfo_ansi
->
foMaxCharWidth
,
pfo
->
foMaxCharWidth
)
*
pfo
->
rescale
;
}
else
{
...
...
include/Makefile.in
View file @
56539394
...
...
@@ -39,6 +39,7 @@ INSTALLED_INCLUDES = \
mapidefs.h
\
mciavi.h
\
mcx.h
\
minmax.h
\
mmreg.h
\
mmsystem.h
\
msacm.h
\
...
...
include/minmax.h
0 → 100644
View file @
56539394
/*
* min/max macros
*
* Copyright 2001 Francois Gouget
*/
#ifndef __WINE_MINMAX_H
#define __WINE_MINMAX_H
#ifndef max
#define max(a,b) (((a) > (b)) ? (a) : (b))
#endif
#ifndef min
#define min(a,b) (((a) < (b)) ? (a) : (b))
#endif
#endif
/* __WINE_MINMAX_H */
include/windef.h
View file @
56539394
...
...
@@ -140,16 +140,15 @@ typedef INT CALLBACK (*PROC)();
#define ADD_LOWORD(dw,val) ((dw) = ((dw) & 0xffff0000) | LOWORD((DWORD)(dw)+(val)))
#endif
/* min and max macros */
#define __max(a,b) (((a) > (b)) ? (a) : (b))
#define __min(a,b) (((a) < (b)) ? (a) : (b))
#ifndef NOMINMAX
#ifndef max
#define max(a,b) (((a) > (b)) ? (a) : (b))
#endif
#ifndef min
#define min(a,b) (((a) < (b)) ? (a) : (b))
#endif
#endif
/* NOMINMAX */
#ifndef _MAX_PATH
/* FIXME: These are supposed to be in stdlib.h only */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment