[SCM] opencore-amr packaging branch, master, updated. upstream/0.1.2-10-g7bf1e45

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Fri Sep 18 20:48:44 UTC 2009


The following commit has been merged in the master branch:
commit 451f17cdaf259a26e0d6667a4839f6f9d27078e8
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue May 19 02:55:01 2009 -0400

    Do not define reserved keyword __inline.

diff --git a/amrnb/Makefile b/amrnb/Makefile
index 1a8f567..9f13e4a 100644
--- a/amrnb/Makefile
+++ b/amrnb/Makefile
@@ -6,7 +6,7 @@ AMR_BASE = $(OC_BASE)/codecs_v2/audio/gsm_amr
 # To compile as C instead of C++, define BUILD_AS_C
 ifneq (, $(BUILD_AS_C))
     CXX = $(CC)
-    CXXFLAGS += -x c -std=c99 -D__inline="static inline"
+    CXXFLAGS += -x c -std=c99
 endif
 
 ifeq (, $(PREFIX))
diff --git a/amrwb/Makefile b/amrwb/Makefile
index baa4ca9..34e4628 100644
--- a/amrwb/Makefile
+++ b/amrwb/Makefile
@@ -6,7 +6,7 @@ AMR_BASE = $(OC_BASE)/codecs_v2/audio/gsm_amr
 # To compile as C instead of C++, define BUILD_AS_C
 ifneq (, $(BUILD_AS_C))
     CXX = $(CC)
-    CXXFLAGS += -x c -std=c99 -D__inline="static inline"
+    CXXFLAGS += -x c -std=c99
 endif
 
 ifeq (, $(PREFIX))

-- 
opencore-amr packaging



More information about the pkg-multimedia-commits mailing list