Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
f7e1b0f9
Commit
f7e1b0f9
authored
3 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
configure: Always define _WIN32 for msvcrt builds.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
339950a7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
configure
+2
-1
2 additions, 1 deletion
configure
configure.ac
+2
-1
2 additions, 1 deletion
configure.ac
include/msvcrt/corecrt.h
+10
-2
10 additions, 2 deletions
include/msvcrt/corecrt.h
with
14 additions
and
4 deletions
configure
+
2
−
1
View file @
f7e1b0f9
...
...
@@ -17613,7 +17613,8 @@ if test "x$ac_cv_cflags__Wl__delayload_autoconftest_dll" = xyes; then :
DELAYLOADFLAG="-Wl,-delayload,"
fi ;;
*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-builtin" >&5
*) MSVCRTFLAGS="-D_WIN32"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-builtin" >&5
$as_echo_n "checking whether the compiler supports -fno-builtin... " >&6; }
if ${ac_cv_cflags__fno_builtin+:} false; then :
$as_echo_n "(cached) " >&6
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
2
−
1
View file @
f7e1b0f9
...
...
@@ -2045,7 +2045,8 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy=
case $host_os in
mingw32*) dnl Check for delayload linker support
WINE_TRY_CFLAGS([-Wl,-delayload,autoconftest.dll],[AC_SUBST(DELAYLOADFLAG,["-Wl,-delayload,"])]) ;;
*) WINE_TRY_CFLAGS([-fno-builtin],[MSVCRTFLAGS="$MSVCRTFLAGS -fno-builtin"])
*) MSVCRTFLAGS="-D_WIN32"
WINE_TRY_CFLAGS([-fno-builtin],[MSVCRTFLAGS="$MSVCRTFLAGS -fno-builtin"])
WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) ;;
esac
...
...
This diff is collapsed.
Click to expand it.
include/msvcrt/corecrt.h
+
10
−
2
View file @
f7e1b0f9
...
...
@@ -25,8 +25,16 @@
#define __WINE_USE_MSVCRT
#endif
#ifdef __WINE_WINE_PORT_H
# error You cannot use both wine/port.h and msvcrt headers
#ifdef __WINE_CONFIG_H
# error You cannot use config.h with msvcrt
#endif
#ifndef _WIN32
# define _WIN32
#endif
#ifndef WIN32
# define WIN32
#endif
#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__aarch64__)) && !defined(_WIN64)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment