--- multiplexer/global.h	2006/12/09 21:44:20	1.25
+++ multiplexer/global.h	2008/11/12 21:46:44	1.26
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <sys/poll.h>
 #include <sys/time.h>
 #include <sys/unistd.h>
@@ -87,19 +87,19 @@
 #define ENDSTR_CLOSE     1
 #define ENDSTR_WAIT      2
 
-#define boolean u_int8_t
+#define boolean uint8_t
 #define FALSE   0
 #define TRUE    1
 
-#define byte u_int8_t
+#define byte uint8_t
 #define t_msec int32_t
 
 /* ISO 13818 clock reference 90kHz (33 bit) with 27MHz extension (9 bit).
  * ba33 holds the high bit of base.
  */
 typedef struct {
-  u_int32_t base;
-  u_int16_t ext;
+  uint32_t base;
+  uint16_t ext;
   byte ba33;
   boolean valid;
 } clockref;
@@ -109,7 +109,7 @@ typedef struct {
  * wrapping faults without producing conversion inaccuracies.
  */
 typedef struct {
-  u_int32_t base;
+  uint32_t base;
   t_msec msec;
 } conversion_base;
 
@@ -301,10 +301,10 @@ typedef struct {
     struct {
       struct {
         clockref scr;
-        u_int32_t muxrate;
+        uint32_t muxrate;
       } ph;
       struct {
-        u_int32_t ratebound;
+        uint32_t ratebound;
         byte audiobound;
         byte videobound;
         boolean csps_flag;
@@ -321,7 +321,7 @@ typedef struct {
       struct streamdescr *stream[MAX_STRPERPS];
     } ps;
     struct {
-      u_int16_t transportstreamid;
+      uint16_t transportstreamid;
       byte pat_version;
       byte newpat_version;
       pmt_descr *pat;