From: leslie <unknown>
Date: Sun, 3 Jun 2012 13:12:43 +0000 (+0200)
Subject: sasc: several compile fixes
X-Git-Tag: upstream/620~6
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=131db3d0ef6002225e8ba174e3b64eab72c240df;p=sasc-ng.git

sasc: several compile fixes
---

diff --git a/.hgignore b/.hgignore
index 9ad8230..9f56d21 100644
--- a/.hgignore
+++ b/.hgignore
@@ -22,6 +22,7 @@ contrib/sasc-ng/sasc-ng
 contrib/sasc-ng/objs/version.cpp
 contrib/sasc-ng/sc/config.h
 contrib/sasc-ng/sc/PLUGINS/src/sc-src
+contrib/sasc-ng/sc/locale
 contrib/sasc-ng/FFdecsa
 
 syntax: regexp
diff --git a/contrib/sasc-ng/Makefile b/contrib/sasc-ng/Makefile
index 0e853b6..aacd598 100644
--- a/contrib/sasc-ng/Makefile
+++ b/contrib/sasc-ng/Makefile
@@ -8,7 +8,7 @@ include config.mak
 
 CC       ?= gcc
 CXX      ?= g++
-CXXFLAGS ?= -Wall -D__user= -Werror 
+CXXFLAGS ?= -Wall -D__user= 
 CFLAGS   ?= -Wall -D__user= 
 
 ifdef DVB_DIR
@@ -20,7 +20,7 @@ DEFINES += -DRELEASE_VERSION=\"$(VERSION)\" -D__KERNEL_STRICT_NAMES
 INCLUDES += -Idvbloopback/module
 LBDIR = dvbloopback/src
 SCDIR = sc/PLUGINS/src/$(SCVER)
-SC_FLAGS = -O2 -fPIC -Wall -Woverloaded-virtual
+SC_FLAGS = -O2 -fPIC -Wall -Woverloaded-virtual -fno-strict-aliasing
 
 ifdef AUXSERVER_OPTS
   DEFINES += ${AUXSERVER_OPTS}
diff --git a/systems/cryptoworks/cryptoworks.c b/systems/cryptoworks/cryptoworks.c
index 1cbdba8..18b73a1 100644
--- a/systems/cryptoworks/cryptoworks.c
+++ b/systems/cryptoworks/cryptoworks.c
@@ -64,7 +64,7 @@ ADD_MODULE(L_SYS,lm_sys)
     } \
   LBEND();
 
-int minEcmTime=150; // ms
+static int minEcmTime=150; // ms
 
 // -- cCwDes -------------------------------------------------------------------