Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stefan Strogin
flac
Commits
a7e3705d
Commit
a7e3705d
authored
Jun 22, 2012
by
Erik de Castro Lopo
Browse files
Move code inside #ifdef _MSC_VER to compat.h.
parent
5b62b770
Changes
5
Hide whitespace changes
Inline
Side-by-side
include/share/compat.h
View file @
a7e3705d
...
...
@@ -74,3 +74,33 @@
#else
#define FLAC__U64L(x) x##LLU
#endif
#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__
#define FLAC__STRNCASECMP strnicmp
#else
#define FLAC__STRNCASECMP strncasecmp
#endif
#if defined _MSC_VER || defined __MINGW32__
#include
<io.h>
/* for _setmode() */
#include
<fcntl.h>
/* for _O_BINARY */
#endif
#if defined __CYGWIN__ || defined __EMX__
#include
<io.h>
/* for setmode(), O_BINARY */
#include
<fcntl.h>
/* for _O_BINARY */
#endif
#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__
#if defined __BORLANDC__
#include
<utime.h>
/* for utime() */
#else
#include
<sys/utime.h>
/* for utime() */
#endif
#include
<io.h>
/* for chmod() */
#include
<sys/types.h>
/* for off_t */
#else
#include
<sys/types.h>
/* some flavors of BSD (like OS X) require this to get time_t */
#include
<utime.h>
/* for utime() */
#include
<unistd.h>
/* for chown(), unlink() */
#endif
src/libFLAC/metadata_iterators.c
View file @
a7e3705d
...
...
@@ -38,19 +38,6 @@
#include
<stdlib.h>
#include
<string.h>
#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__
#if defined __BORLANDC__
#include
<utime.h>
/* for utime() */
#else
#include
<sys/utime.h>
/* for utime() */
#endif
#include
<io.h>
/* for chmod() */
#include
<sys/types.h>
/* for off_t */
#else
#include
<sys/types.h>
/* some flavors of BSD (like OS X) require this to get time_t */
#include
<utime.h>
/* for utime() */
#include
<unistd.h>
/* for chown(), unlink() */
#endif
#include
<sys/stat.h>
/* for stat(), maybe chmod() */
#include
"private/metadata.h"
...
...
src/libFLAC/metadata_object.c
View file @
a7e3705d
...
...
@@ -41,6 +41,7 @@
#include
"FLAC/assert.h"
#include
"share/alloc.h"
#include
"share/compat.h"
/* Alias the first (in share/alloc.h) to the second (in src/libFLAC/memory.c). */
#define safe_malloc_mul_2op_ safe_malloc_mul_2op_p
...
...
@@ -1379,13 +1380,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_matches(const FLAC
FLAC__ASSERT
(
0
!=
entry
.
entry
&&
entry
.
length
>
0
);
{
const
FLAC__byte
*
eq
=
(
FLAC__byte
*
)
memchr
(
entry
.
entry
,
'='
,
entry
.
length
);
#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__
#define FLAC__STRNCASECMP strnicmp
#else
#define FLAC__STRNCASECMP strncasecmp
#endif
return
(
0
!=
eq
&&
(
unsigned
)(
eq
-
entry
.
entry
)
==
field_name_length
&&
0
==
FLAC__STRNCASECMP
(
field_name
,
(
const
char
*
)
entry
.
entry
,
field_name_length
));
#undef FLAC__STRNCASECMP
}
}
...
...
src/libFLAC/stream_decoder.c
View file @
a7e3705d
...
...
@@ -33,14 +33,6 @@
# include <config.h>
#endif
#if defined _MSC_VER || defined __MINGW32__
#include
<io.h>
/* for _setmode() */
#include
<fcntl.h>
/* for _O_BINARY */
#endif
#if defined __CYGWIN__ || defined __EMX__
#include
<io.h>
/* for setmode(), O_BINARY */
#include
<fcntl.h>
/* for _O_BINARY */
#endif
#include
<stdio.h>
#include
<stdlib.h>
/* for malloc() */
#include
<string.h>
/* for memset/memcpy() */
...
...
@@ -63,13 +55,7 @@
/* technically this should be in an "export.c" but this is convenient enough */
FLAC_API
int
FLAC_API_SUPPORTS_OGG_FLAC
=
#if FLAC__HAS_OGG
1
#else
0
#endif
;
FLAC_API
int
FLAC_API_SUPPORTS_OGG_FLAC
=
FLAC__HAS_OGG
;
/***********************************************************************
...
...
src/libFLAC/stream_encoder.c
View file @
a7e3705d
...
...
@@ -33,14 +33,6 @@
# include <config.h>
#endif
#if defined _MSC_VER || defined __MINGW32__
#include
<io.h>
/* for _setmode() */
#include
<fcntl.h>
/* for _O_BINARY */
#endif
#if defined __CYGWIN__ || defined __EMX__
#include
<io.h>
/* for setmode(), O_BINARY */
#include
<fcntl.h>
/* for _O_BINARY */
#endif
#include
<limits.h>
#include
<stdio.h>
#include
<stdlib.h>
/* for malloc() */
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment