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

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c1d0ed5fcfd975d3fc92e33d1d5f2c1ecfe733e0
Author: Martin Storsjo <martin at martin.st>
Date:   Tue May 19 16:14:30 2009 +0200

    Revert "Do not define reserved keyword __inline."
    
    This reverts commit 53993177e6ac7be33a0dd9b69cddd6f1310760ed.
    
    Things either break when linking the shared libraries or when linking
    the library to an executable (which is why this probably slipped through).

diff --git a/amrnb/Makefile b/amrnb/Makefile
index 87331cb..b54cf65 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
+    CXXFLAGS += -x c -std=c99 -D__inline="static inline"
 endif
 
 ifeq (, $(PREFIX))
diff --git a/amrwb/Makefile b/amrwb/Makefile
index 944fe06..8f632bf 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
+    CXXFLAGS += -x c -std=c99 -D__inline="static inline"
 endif
 
 ifeq (, $(PREFIX))

-- 
opencore-amr packaging