[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[634] mplayerxp

[<nic...@us...>]

Revision: 634
          http://sourceforge.net/p/mplayerxp/code/634
Author:   nickols_k
Date:     2013-04-30 17:28:09 +0000 (Tue, 30 Apr 2013)
Log Message:
-----------
sync with beye

Modified Paths:
--------------
    mplayerxp/configure
    mplayerxp/osdep/bswap.h

Modified: mplayerxp/configure
===================================================================
--- mplayerxp/configure	2013-04-27 17:29:31 UTC (rev 633)
+++ mplayerxp/configure	2013-04-30 17:28:09 UTC (rev 634)
@@ -406,6 +406,12 @@
 check_func2 execinfo.h backtrace
 print_config HAVE_ mpxp_config.h mpxp_config.mak backtrace
 
+check_header endian.h
+print_config HAVE_ mpxp_config.h mpxp_config.mak endian_h
+
+check_header byteswap.h
+print_config HAVE_ mpxp_config.h mpxp_config.mak byteswap_h
+
 disable inet_pton
 if enabled streaming ; then
 disable socklib

Modified: mplayerxp/osdep/bswap.h
===================================================================
--- mplayerxp/osdep/bswap.h	2013-04-27 17:29:31 UTC (rev 633)
+++ mplayerxp/osdep/bswap.h	2013-04-30 17:28:09 UTC (rev 634)
@@ -1,16 +1,18 @@
 #ifndef __BSWAP_H__
 #define __BSWAP_H__
+#include "mpxp_config.h"
 
+#ifdef HAVE_ENDIAN_H
+#include <endian.h>
+#endif
 #ifdef HAVE_BYTESWAP_H
 #include <byteswap.h>
-#else
-
+#endif
 #include <inttypes.h> /* for __WORDSIZE */
-#include "mpxp_config.h"
 
 namespace mpxp {
 
-#ifdef WORDS_BIGENDIAN
+#if __BYTE_ORDER == __BIG_ENDIAN
 #define FOURCC_TAG(ch0,ch1,ch2,ch3) (((uint32_t)(ch3)|((uint32_t)ch2<<8)|(uint32_t)ch1<<16)|((uint32_t)ch0<<24))
 #define TWOCC_TAG(ch0,ch1) ((uint16_t)ch0|((uint16_t)ch1)<<8)
 #else
@@ -28,6 +30,7 @@
 	return  (uint16_t)ch0|((uint16_t)ch1)<<8;
     }
 
+#ifndef HAVE_BYTESWAP_H
 #if defined(__i386__)
     inline uint16_t bswap_16(uint16_t x) {
 	__asm("xchgb %b0,%h0"	:
@@ -154,7 +157,7 @@
 // be2me ... BigEndian to MachineEndian
 // le2me ... LittleEndian to MachineEndian
 
-#ifdef WORDS_BIGENDIAN
+#if __BYTE_ORDER == __BIG_ENDIAN
     inline uint16_t be2me_16(uint16_t x) { return x; }
     inline uint32_t be2me_32(uint32_t x) { return x; }
     inline uint64_t be2me_64(uint64_t x) { return x; }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.