fix htonl on win32

contrib/mpeg_encode/bitio.cpp

@@ -13,8 +13,6 @@
  *									     *
  *===========================================================================*/
 
-#define htonl(x) (x) // gmsh
-
 /*
  * Copyright (c) 1995 The Regents of the University of California.
  * All rights reserved.
@@ -89,7 +87,6 @@
 #include "bitio.h"
 #include "mtypes.h"
 
-
 /*===============================*
  * INTERNAL PROCEDURE prototypes *
  *===============================*/

contrib/mpeg_encode/headers/byteorder.h

@@ -72,5 +72,13 @@
 #else
     /* let in.h handle it, if possible */                  
 #include <sys/types.h>
+
+// gmsh: for windows
+#if !defined(WIN32) || defined(__CYGWIN__)
+#include <netinet/in.h>
+#else
+#include <winsock.h>
+#endif
+
 #endif /* FORCE_LITTLE_ENDIAN */
 #endif /* FORCE_BIG_ENDIAN */

contrib/mpeg_encode/headers/general.h

@@ -115,7 +115,10 @@ int pclose();
  * TYPE DEFINITIONS *
  *==================*/
 
-typedef int boolean;
+// gmsh: cannot use a typedef because windows does, too -> use a #define 
+//typedef int boolean;
+#define boolean int
+
 /* this is for JPEG stuff */
 #define BOOLEAN_DEFINED
 #define HAVE_BOOLEAN