From e2b3b07c93845beaf8ed128fa57092ab49fa4494 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 14 May 2010 16:25:11 +0000
Subject: [PATCH] fix msvc compile

---
 contrib/mpeg_encode/headers/general.h | 4 ++--
 contrib/mpeg_encode/pframe.cpp        | 2 +-
 contrib/mpeg_encode/readframe.cpp     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/mpeg_encode/headers/general.h b/contrib/mpeg_encode/headers/general.h
index a4782c897b..f78dfd2af4 100644
--- a/contrib/mpeg_encode/headers/general.h
+++ b/contrib/mpeg_encode/headers/general.h
@@ -149,8 +149,8 @@ typedef int int32;
 #define max(a,b) ((a) > (b) ? (a) : (b))
 #undef min
 #define min(a,b) ((a) < (b) ? (a) : (b))
-#undef abs
-#define abs(a) ((a) >= 0 ? (a) : -(a))
+//#undef abs
+//#define abs(a) ((a) >= 0 ? (a) : -(a))
 
 
 #endif
diff --git a/contrib/mpeg_encode/pframe.cpp b/contrib/mpeg_encode/pframe.cpp
index bd51ddc8bb..37ccb98cfb 100644
--- a/contrib/mpeg_encode/pframe.cpp
+++ b/contrib/mpeg_encode/pframe.cpp
@@ -126,7 +126,7 @@
  *==============*/
 
 #include <assert.h>
-#include <sys/param.h>
+//#include <sys/param.h>
 #include "all.h"
 #include "mtypes.h"
 #include "bitio.h"
diff --git a/contrib/mpeg_encode/readframe.cpp b/contrib/mpeg_encode/readframe.cpp
index de71b9967f..3eabffadad 100644
--- a/contrib/mpeg_encode/readframe.cpp
+++ b/contrib/mpeg_encode/readframe.cpp
@@ -124,7 +124,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <string.h>
-#include <unistd.h>
+//#include <unistd.h>
 #include "mtypes.h"
 #include "frames.h"
 #include "prototypes.h"
-- 
GitLab