Renaming the CELT plc.c file to celt_lpc.c to avoid MSVC conflicts with Skype's PLC.c

celt/celt.c

@@ -47,7 +47,7 @@
 #include "mathops.h"
 #include "float_cast.h"
 #include <stdarg.h>
-#include "plc.h"
+#include "celt_lpc.h"
 #include "vq.h"
 
 #ifndef OPUS_VERSION

celt/celt.vcxproj

@@ -95,7 +95,7 @@
     <ClInclude Include="modes.h" />
     <ClInclude Include="os_support.h" />
     <ClInclude Include="pitch.h" />
-    <ClInclude Include="plc.h" />
+    <ClInclude Include="celt_lpc.h" />
     <ClInclude Include="quant_bands.h" />
     <ClInclude Include="rate.h" />
     <ClInclude Include="stack_alloc.h" />
@@ -114,7 +114,7 @@
     <ClCompile Include="mdct.c" />
     <ClCompile Include="modes.c" />
     <ClCompile Include="pitch.c" />
-    <ClCompile Include="plc.c" />
+    <ClCompile Include="celt_lpc.c" />
     <ClCompile Include="quant_bands.c" />
     <ClCompile Include="rate.c" />
     <ClCompile Include="vq.c" />

celt/celt.vcxproj.filters

@@ -78,7 +78,7 @@
     <ClInclude Include="pitch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="plc.h">
+    <ClInclude Include="celt_lpc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="quant_bands.h">
@@ -131,7 +131,7 @@
     <ClCompile Include="pitch.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="plc.c">
+    <ClCompile Include="celt_lpc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="quant_bands.c">
@@ -147,4 +147,4 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
+</Project>

celt/celt_lpc.c

@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "plc.h"
+#include "celt_lpc.h"
 #include "stack_alloc.h"
 #include "mathops.h"
 

celt/pitch.c

@@ -40,6 +40,7 @@
 #include "modes.h"
 #include "stack_alloc.h"
 #include "mathops.h"
+#include "celt_lpc.h"
 
 static void find_best_pitch(opus_val32 *xcorr, opus_val16 *y, int len,
                             int max_pitch, int *best_pitch
@@ -96,7 +97,6 @@ static void find_best_pitch(opus_val32 *xcorr, opus_val16 *y, int len,
    }
 }
 
-#include "plc.h"
 void pitch_downsample(celt_sig * restrict x[], opus_val16 * restrict x_lp,
       int len, int _C)
 {

celt_headers.txt

@@ -21,7 +21,7 @@ celt/mfrngcod.h \
 celt/modes.h \
 celt/os_support.h \
 celt/pitch.h \
-celt/plc.h \
+celt/celt_lpc.h \
 celt/quant_bands.h \
 celt/rate.h \
 celt/stack_alloc.h \

celt_sources.mk

@@ -10,7 +10,7 @@ celt/mathops.c \
 celt/mdct.c \
 celt/modes.c \
 celt/pitch.c \
-celt/plc.c \
+celt/celt_lpc.c \
 celt/quant_bands.c \
 celt/rate.c \
 celt/vq.c