[xiph-commits] r13922 - in trunk/theora: . lib

[sping at svn.xiph.org]

Author: sping
Date: 2007-10-02 13:50:28 -0700 (Tue, 02 Oct 2007)
New Revision: 13922

Modified:
   trunk/theora/lib/cpu_asm_1_msvc.c
   trunk/theora/update_asm.sh
Log:
Compile fix

Modified: trunk/theora/lib/cpu_asm_1_msvc.c
===================================================================
--- trunk/theora/lib/cpu_asm_1_msvc.c	2007-10-02 20:49:48 UTC (rev 13921)
+++ trunk/theora/lib/cpu_asm_1_msvc.c	2007-10-02 20:50:28 UTC (rev 13922)
@@ -1,14 +1,16 @@
-#ifdef USE_ASM
-
-   pushfl
-   pushfl
-   popl          eax
-   movl          eax,ebx
-   xorl   0x200000,eax
-   pushl         eax
-   popfl
-   pushfl
-   popl          eax
-   popfl
-
-#endif /* USE_ASM */
+#ifdef USE_ASM
+
+__asm {
+   pushfl
+   pushfl
+   popl          eax
+   movl          eax,ebx
+   xorl   0x200000,eax
+   pushl         eax
+   popfl
+   pushfl
+   popl          eax
+   popfl
+}
+
+#endif /* USE_ASM */

Modified: trunk/theora/update_asm.sh
===================================================================
--- trunk/theora/update_asm.sh	2007-10-02 20:49:48 UTC (rev 13921)
+++ trunk/theora/update_asm.sh	2007-10-02 20:50:28 UTC (rev 13922)
@@ -10,6 +10,7 @@
 
 echo "#ifdef USE_ASM" > ${OUT_FILE}
 echo "" >> ${OUT_FILE}
+echo "__asm {" >> ${OUT_FILE}
 
 cat ${IN_FILE}\
     | grep '\\n\\t'\
@@ -20,8 +21,8 @@
     | sed -r 's/\$((0x)?[0-9]+)/\1/'\
     >> lib/cpu_asm_1_msvc.c
 
+echo "}" >> ${OUT_FILE}
 echo "" >> ${OUT_FILE}
 echo "#endif /* USE_ASM */" >> ${OUT_FILE}
 
 cat ${OUT_FILE}
-