From a9239660df85b23d495a98b857b3d8f7889b5008 Mon Sep 17 00:00:00 2001
From: Matthew White <mehw.is.me@inventati.org>
Date: Wed, 10 Nov 2021 03:19:48 +0000
Subject: [PATCH] fix compilation problems

Replace __I386__ with __i386__, and __x86-64__ with __x86_64__.

The 'or' condition '||' is incompatible with the directive '#ifdef',
prefer '#if defined(VAR_A) || defined(VAR_B)'.

In plugins/livevideo/livevideo.C use HAVE_DB, rather than HAVE_LIBDV.
---
 cinelerra-5.1/cinelerra/commercials.h       | 2 +-
 cinelerra-5.1/cinelerra/dbwindow.h          | 2 +-
 cinelerra-5.1/cinelerra/mediadb.h           | 2 +-
 cinelerra-5.1/db/tdb.h                      | 2 +-
 cinelerra-5.1/plugins/livevideo/livevideo.C | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cinelerra-5.1/cinelerra/commercials.h b/cinelerra-5.1/cinelerra/commercials.h
index 7869c3c3..443cf6c7 100644
--- a/cinelerra-5.1/cinelerra/commercials.h
+++ b/cinelerra-5.1/cinelerra/commercials.h
@@ -1,4 +1,4 @@
-#ifdef __I386__ || __x86-64__
+#if defined(__i386__) || defined(__x86_64__)
 #ifndef _COMMERCIALS_H_
 #define _COMMERCIALS_H_
 
diff --git a/cinelerra-5.1/cinelerra/dbwindow.h b/cinelerra-5.1/cinelerra/dbwindow.h
index c8a12f66..103beb6d 100644
--- a/cinelerra-5.1/cinelerra/dbwindow.h
+++ b/cinelerra-5.1/cinelerra/dbwindow.h
@@ -1,4 +1,4 @@
-#ifdef __I386__ || __x86-64__
+#if defined(__i386__) || defined(__x86_64__)
 #ifndef _DBWINDOW_H_
 #define _DBWINDOW_H_
 
diff --git a/cinelerra-5.1/cinelerra/mediadb.h b/cinelerra-5.1/cinelerra/mediadb.h
index 71e96bfb..f55cc6b0 100644
--- a/cinelerra-5.1/cinelerra/mediadb.h
+++ b/cinelerra-5.1/cinelerra/mediadb.h
@@ -1,4 +1,4 @@
-#ifdef __I386__ || __x86-64__
+#if defined(__i386__) || defined(__x86_64__)
 #ifndef _MEDIA_DB_H_
 #define _MEDIA_DB_H_
 
diff --git a/cinelerra-5.1/db/tdb.h b/cinelerra-5.1/db/tdb.h
index e4a08565..24c8617c 100644
--- a/cinelerra-5.1/db/tdb.h
+++ b/cinelerra-5.1/db/tdb.h
@@ -1,4 +1,4 @@
-#ifdef __I386__ || __x86-64__
+#if defined(__i386__) || defined(__x86_64__)
 #ifndef __DB_H__
 #define __DB_H__
 #include <cstring>
diff --git a/cinelerra-5.1/plugins/livevideo/livevideo.C b/cinelerra-5.1/plugins/livevideo/livevideo.C
index c30034ab..ac69ba20 100644
--- a/cinelerra-5.1/plugins/livevideo/livevideo.C
+++ b/cinelerra-5.1/plugins/livevideo/livevideo.C
@@ -31,7 +31,7 @@
 #include "filexml.h"
 #include "guicast.h"
 #include "language.h"
-#if HAVE_LIBDV
+#if HAVE_DV
 #include "libdv.h"
 #endif
 #include "libmjpeg.h"
-- 
2.32.0