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
Zsolt Vadász
wine
Commits
368dab37
Commit
368dab37
authored
19 years ago
by
Phil Krylov
Committed by
Alexandre Julliard
19 years ago
Browse files
Options
Downloads
Patches
Plain Diff
ntdll: Fix tape.c compilation on Darwin.
parent
06188b6d
Loading
Loading
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
configure
+6
-0
6 additions, 0 deletions
configure
configure.ac
+2
-1
2 additions, 1 deletion
configure.ac
dlls/ntdll/tape.c
+3
-1
3 additions, 1 deletion
dlls/ntdll/tape.c
with
11 additions
and
2 deletions
configure
+
6
−
0
View file @
368dab37
...
...
@@ -17836,6 +17836,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_MTIO_H
#include <sys/mtio.h>
#endif
...
...
@@ -17882,6 +17883,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_MTIO_H
#include <sys/mtio.h>
#endif
...
...
@@ -17949,6 +17951,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_MTIO_H
#include <sys/mtio.h>
#endif
...
...
@@ -17995,6 +17998,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_MTIO_H
#include <sys/mtio.h>
#endif
...
...
@@ -18062,6 +18066,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_MTIO_H
#include <sys/mtio.h>
#endif
...
...
@@ -18108,6 +18113,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_MTIO_H
#include <sys/mtio.h>
#endif
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
2
−
1
View file @
368dab37
...
...
@@ -1357,7 +1357,8 @@ AC_CHECK_MEMBERS([siginfo_t.si_fd],,,[#include <signal.h>])
dnl Check for struct mtget members
AC_CHECK_MEMBERS([struct mtget.mt_blksiz, struct mtget.mt_gstat, struct mtget.mt_blkno],,,
[#ifdef HAVE_SYS_MTIO_H
[#include <sys/types.h>
#ifdef HAVE_SYS_MTIO_H
#include <sys/mtio.h>
#endif])
...
...
This diff is collapsed.
Click to expand it.
dlls/ntdll/tape.c
+
3
−
1
View file @
368dab37
...
...
@@ -344,7 +344,7 @@ static NTSTATUS TAPE_Prepare( int fd, TAPE_PREPARE *data )
*/
static
NTSTATUS
TAPE_SetDriveParams
(
int
fd
,
TAPE_SET_DRIVE_PARAMETERS
*
data
)
{
#ifdef
HAVE_SYS_MTIO_H
#if
def
ined(
HAVE_SYS_MTIO_H
) && defined(MTCOMPRESSION)
struct
mtop
cmd
;
TRACE
(
"fd: %d ECC: 0x%02x, compression: 0x%02x padding: 0x%02x
\n
"
,
...
...
@@ -425,6 +425,7 @@ static NTSTATUS TAPE_SetPosition( int fd, TAPE_SET_POSITION *data )
cmd
.
mt_count
=
-
data
->
Offset
.
u
.
LowPart
;
}
break
;
#if defined(MTFSS) && defined(MTBSS)
case
TAPE_SPACE_SETMARKS
:
if
(
data
->
Offset
.
u
.
LowPart
>=
0
)
{
cmd
.
mt_op
=
MTFSS
;
...
...
@@ -435,6 +436,7 @@ static NTSTATUS TAPE_SetPosition( int fd, TAPE_SET_POSITION *data )
cmd
.
mt_count
=
-
data
->
Offset
.
u
.
LowPart
;
}
break
;
#endif
case
TAPE_LOGICAL_BLOCK
:
case
TAPE_PSEUDO_LOGICAL_BLOCK
:
case
TAPE_SPACE_RELATIVE_BLOCKS
:
...
...
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