[x264-devel] Move AltiVec header to ppccommon.h
Brad
brad at comstyle.com
Mon Jan 5 03:35:09 CET 2009
The following diff moves the AltiVec header from being included in all
of the individual files of source in the PowerPC code to being in the
ppccommon.h header, as was requested of me as a prerequisite step for
a diff I had posted earlier. I don't use nor have a Linux/PowerPC
system so if someone could please check that this at least builds.
diff -upr ppc/dct.c /usr/ports/multimedia/x264/w-x264-20090103/x264-snapshot-20090103-2245/common/ppc/dct.c
--- ppc/dct.c Sat Jan 3 16:45:09 2009
+++ /usr/ports/multimedia/x264/w-x264-20090103/x264-snapshot-20090103-2245/common/ppc/dct.c Sun Jan 4 17:17:36 2009
@@ -21,10 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
*****************************************************************************/
-#ifdef SYS_LINUX
-#include <altivec.h>
-#endif
-
#include "common/common.h"
#include "ppccommon.h"
diff -upr ppc/deblock.c /usr/ports/multimedia/x264/w-x264-20090103/x264-snapshot-20090103-2245/common/ppc/deblock.c
--- ppc/deblock.c Sat Jan 3 16:45:09 2009
+++ /usr/ports/multimedia/x264/w-x264-20090103/x264-snapshot-20090103-2245/common/ppc/deblock.c Sun Jan 4 17:17:55 2009
@@ -18,10 +18,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
*****************************************************************************/
-#if defined SYS_LINUX
-#include <altivec.h>
-#endif
-
#include "common/common.h"
#include "ppccommon.h"
diff -upr ppc/mc.c /usr/ports/multimedia/x264/w-x264-20090103/x264-snapshot-20090103-2245/common/ppc/mc.c
--- ppc/mc.c Sat Jan 3 16:45:09 2009
+++ /usr/ports/multimedia/x264/w-x264-20090103/x264-snapshot-20090103-2245/common/ppc/mc.c Sun Jan 4 17:19:33 2009
@@ -27,10 +27,6 @@
#include <stdint.h>
#include <stdarg.h>
-#ifdef SYS_LINUX
-#include <altivec.h>
-#endif
-
#include "x264.h"
#include "common/common.h"
#include "common/mc.h"
diff -upr ppc/pixel.c /usr/ports/multimedia/x264/w-x264-20090103/x264-snapshot-20090103-2245/common/ppc/pixel.c
--- ppc/pixel.c Sat Jan 3 16:45:09 2009
+++ /usr/ports/multimedia/x264/w-x264-20090103/x264-snapshot-20090103-2245/common/ppc/pixel.c Sun Jan 4 17:18:21 2009
@@ -21,10 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
*****************************************************************************/
-#ifdef SYS_LINUX
-#include <altivec.h>
-#endif
-
#include "common/common.h"
#include "ppccommon.h"
diff -upr ppc/ppccommon.h /usr/ports/multimedia/x264/w-x264-20090103/x264-snapshot-20090103-2245/common/ppc/ppccommon.h
--- ppc/ppccommon.h Sat Jan 3 16:45:09 2009
+++ /usr/ports/multimedia/x264/w-x264-20090103/x264-snapshot-20090103-2245/common/ppc/ppccommon.h Sun Jan 4 17:19:51 2009
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
*****************************************************************************/
+#ifdef SYS_LINUX
+#include <altivec.h>
+#endif
+
/***********************************************************************
* For constant vectors, use parentheses on OS X and braces on Linux
**********************************************************************/
diff -upr ppc/predict.c /usr/ports/multimedia/x264/w-x264-20090103/x264-snapshot-20090103-2245/common/ppc/predict.c
--- ppc/predict.c Sat Jan 3 16:45:09 2009
+++ /usr/ports/multimedia/x264/w-x264-20090103/x264-snapshot-20090103-2245/common/ppc/predict.c Sun Jan 4 17:18:35 2009
@@ -18,10 +18,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
*****************************************************************************/
-#ifdef SYS_LINUX
-#include <altivec.h>
-#endif
-
#include "common/common.h"
#include "predict.h"
#include "pixel.h"
diff -upr ppc/quant.c /usr/ports/multimedia/x264/w-x264-20090103/x264-snapshot-20090103-2245/common/ppc/quant.c
--- ppc/quant.c Sat Jan 3 16:45:09 2009
+++ /usr/ports/multimedia/x264/w-x264-20090103/x264-snapshot-20090103-2245/common/ppc/quant.c Sun Jan 4 17:18:44 2009
@@ -18,10 +18,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
*****************************************************************************/
-#if defined SYS_LINUX
-#include <altivec.h>
-#endif
-
#include "common/common.h"
#include "ppccommon.h"
#include "quant.h"
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
More information about the x264-devel
mailing list