Commit 6861143f authored by Michel Lespinasse's avatar Michel Lespinasse
Browse files

CRLF fixes for file output in win32/dos environments

parent 95689f58
......@@ -25,7 +25,7 @@ elif test x"$GCC" = x"yes"; then
dnl -O3
changequote(<<,>>)
OPT_CFLAGS=`echo "$CFLAGS"|sed "s/-O[0-9]*//g;"`
OPT_CFLAGS=`echo "$CFLAGS"|sed "s/-O[0-9]*//g"`
changequote([,])
OPT_CFLAGS="$OPT_CFLAGS -O3"
AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
......@@ -89,7 +89,7 @@ dnl Checks for libraries.
dnl Checks for header files.
INCLUDES='-I$(top_srcdir)/include -I$(top_builddir)/include'
AC_SUBST([INCLUDES])
AC_CHECK_HEADERS([sys/time.h])
AC_CHECK_HEADERS([sys/time.h io.h])
AC_CHECK_GENERATE_INTTYPES([include])
dnl Checks for typedefs, structures, and compiler characteristics.
......
......@@ -28,6 +28,10 @@
#include <string.h>
#include <errno.h>
#include <getopt.h>
#ifdef HAVE_IO_H
#include <fcntl.h>
#include <io.h>
#endif
#include <inttypes.h>
#define BUFFER_SIZE 4096
......@@ -335,6 +339,10 @@ static void ts_loop (void)
int main (int argc, char ** argv)
{
#ifdef HAVE_IO_H
setmode (fileno (stdout), O_BINARY);
#endif
handle_args (argc, argv);
if (demux_pid)
......
......@@ -28,6 +28,10 @@
#include <string.h>
#include <errno.h>
#include <getopt.h>
#ifdef HAVE_IO_H
#include <fcntl.h>
#include <io.h>
#endif
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#include <signal.h>
......@@ -497,6 +501,10 @@ int main (int argc, char ** argv)
vo_instance_t * output;
uint32_t accel;
#ifdef HAVE_IO_H
setmode (fileno (stdout), O_BINARY);
#endif
fprintf (stderr, PACKAGE"-"VERSION
" - by Michel Lespinasse <walken@zoy.org> and Aaron Holtzman\n");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment