projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix printf-tests on W32 by ifdefing the expected output
[platform/upstream/glib.git]
/
glib
/
gbitlock.c
diff --git
a/glib/gbitlock.c
b/glib/gbitlock.c
index
e183d39
..
572c2d1
100644
(file)
--- a/
glib/gbitlock.c
+++ b/
glib/gbitlock.c
@@
-13,9
+13,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: Ryan Lortie <desrt@desrt.ca>
*/
*
* Author: Ryan Lortie <desrt@desrt.ca>
*/
@@
-208,12
+206,12
@@
g_bit_lock (volatile gint *address,
{
#ifdef USE_ASM_GOTO
retry:
{
#ifdef USE_ASM_GOTO
retry:
-
asm
volatile goto ("lock bts %1, (%0)\n"
- "jc %l[contended]"
- : /* no output */
- : "r" (address), "r" (lock_bit)
- : "cc", "memory"
- : contended);
+
__asm__
volatile goto ("lock bts %1, (%0)\n"
+
"jc %l[contended]"
+
: /* no output */
+
: "r" (address), "r" (lock_bit)
+
: "cc", "memory"
+
: contended);
return;
contended:
return;
contended:
@@
-281,12
+279,12
@@
g_bit_trylock (volatile gint *address,
#ifdef USE_ASM_GOTO
gboolean result;
#ifdef USE_ASM_GOTO
gboolean result;
-
asm
volatile ("lock bts %2, (%1)\n"
- "setnc %%al\n"
- "movzx %%al, %0"
- : "=r" (result)
- : "r" (address), "r" (lock_bit)
- : "cc", "memory");
+
__asm__
volatile ("lock bts %2, (%1)\n"
+
"setnc %%al\n"
+
"movzx %%al, %0"
+
: "=r" (result)
+
: "r" (address), "r" (lock_bit)
+
: "cc", "memory");
return result;
#else
return result;
#else