. should compile & run on Solaris with ./configure --disable-dsp

[vlc] / include / common.h

diff --git a/include/common.h b/include/common.h
index 4d64e1a759c287b34652c4faf41d3610e5085d91..3004ec791a63e272973d6a55814b43fb10e50b4e 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -3,7 +3,7 @@
  * Collection of useful common types and macros definitions
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: common.h,v 1.19 2000/12/26 19:14:46 massiot Exp $
+ * $Id: common.h,v 1.21 2001/01/06 07:23:32 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -37,26 +37,25 @@
 typedef u8                  byte_t;
 
 /* Boolean type */
-#ifndef SYS_SOLARIS
-typedef int                 boolean_t;
-#else
+#ifdef BOOLEAN_T_IN_SYS_TYPES_H
 #   include <sys/types.h>
+#else
+typedef int                 boolean_t;
 #endif
 #ifdef SYS_GNU
 #   define _MACH_I386_BOOLEAN_H_
 #endif
 
 /* ptrdiff_t definition */
-#ifdef _HAVE_STDDEF_H
+#ifdef HAVE_STDDEF_H
 #   include <stddef.h>
 #else
 #   include <malloc.h>
-#endif
-
-#ifndef _PTRDIFF_T
-#   define _PTRDIFF_T
+#   ifndef _PTRDIFF_T
+#       define _PTRDIFF_T
 /* Not portable in a 64-bit environment. */
 typedef int                 ptrdiff_t;
+#   endif
 #endif
 
 /* Counter for statistics and profiling */
@@ -126,6 +125,12 @@ typedef struct video_parser_s *         p_video_parser_t;
  * Macros and inline functions
  *****************************************************************************/
 
+#ifdef NTOHL_IN_SYS_PARAM_H
+#   include <sys/param.h>
+#else
+#   include <netinet/in.h>
+#endif
+
 /* CEIL: division with round to nearest greater integer */
 #define CEIL(n, d)  ( ((n) / (d)) + ( ((n) % (d)) ? 1 : 0) )