[avr-libc-commit] [2288] Fix for bug #35197: sleep.h _BV defined as __BV in AT90S8515 section

[Dmitry Xmelkov]

Revision: 2288
          http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2288
Author:   dmix
Date:     2012-01-15 13:20:01 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
Fix for bug #35197: sleep.h _BV defined as __BV in AT90S8515 section
Also fix a similar typo in 2 another files.
Thanks to Bingo.
* include/avr/iotn43u.h: Fix typo with __ASSEMBLER__.
* include/avr/iom32u4.h: Fix typo with __ASSEMBLER__.
* include/avr/sleep.h: Fix typo with _BV.
* NEWS: Add to fixed bug list.

Ticket Links:
------------
    http://savannah.gnu.org/bugs/?35197

Modified Paths:
--------------
    trunk/avr-libc/ChangeLog
    trunk/avr-libc/NEWS
    trunk/avr-libc/include/avr/iom32u4.h
    trunk/avr-libc/include/avr/iotn43u.h
    trunk/avr-libc/include/avr/sleep.h

Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog    2012-01-09 12:12:57 UTC (rev 2287)
+++ trunk/avr-libc/ChangeLog    2012-01-15 13:20:01 UTC (rev 2288)
@@ -1,3 +1,13 @@
+2012-01-15  Dmitry Xmelkov  <address@hidden>
+
+       Fix for bug #35197: sleep.h _BV defined as __BV in AT90S8515 section
+       Also fix a similar typo in 2 another files.
+       Thanks to Bingo.
+       * include/avr/iotn43u.h: Fix typo with __ASSEMBLER__.
+       * include/avr/iom32u4.h: Fix typo with __ASSEMBLER__.
+       * include/avr/sleep.h: Fix typo with _BV.
+       * NEWS: Add to fixed bug list.
+
 2012-01-08  Dmitry Xmelkov  <address@hidden>
 
        * tests/simulate/other/progtype-1.c: New file.

Modified: trunk/avr-libc/NEWS
===================================================================
--- trunk/avr-libc/NEWS 2012-01-09 12:12:57 UTC (rev 2287)
+++ trunk/avr-libc/NEWS 2012-01-15 13:20:01 UTC (rev 2288)
@@ -2,6 +2,7 @@
 
 * Bugs fixed:
 
+  [#35197] sleep.h _BV defined as __BV in AT90S8515 section
   [#35226] Online-documentation broken - [...]
 
 * New devices supported:

Modified: trunk/avr-libc/include/avr/iom32u4.h
===================================================================
--- trunk/avr-libc/include/avr/iom32u4.h        2012-01-09 12:12:57 UTC (rev 
2287)
+++ trunk/avr-libc/include/avr/iom32u4.h        2012-01-15 13:20:01 UTC (rev 
2288)
@@ -540,7 +540,7 @@
 
 #define TIMSK5 _SFR_MEM8(0x73)
 
-#ifndef _ASSEMBLER_
+#ifndef __ASSEMBLER__
 #define ADC _SFR_MEM16(0x78)
 #endif
 #define ADCW _SFR_MEM16(0x78)

Modified: trunk/avr-libc/include/avr/iotn43u.h
===================================================================
--- trunk/avr-libc/include/avr/iotn43u.h        2012-01-09 12:12:57 UTC (rev 
2287)
+++ trunk/avr-libc/include/avr/iotn43u.h        2012-01-15 13:20:01 UTC (rev 
2288)
@@ -74,7 +74,7 @@
 #define ADLAR  4
 #define ACME   6
 
-#ifndef _ASSEMBLER_
+#ifndef __ASSEMBLER__
 #define ADC _SFR_IO16(0x04)
 #endif
 #define ADCW _SFR_IO16(0x04)

Modified: trunk/avr-libc/include/avr/sleep.h
===================================================================
--- trunk/avr-libc/include/avr/sleep.h  2012-01-09 12:12:57 UTC (rev 2287)
+++ trunk/avr-libc/include/avr/sleep.h  2012-01-15 13:20:01 UTC (rev 2288)
@@ -206,7 +206,7 @@
 
     #define set_sleep_mode(mode) \
     do { \
-        _SLEEP_CONTROL_REG = ((_SLEEP_CONTROL_REG & ~__BV(SM)) | (mode)); \
+        _SLEEP_CONTROL_REG = ((_SLEEP_CONTROL_REG & ~_BV(SM)) | (mode)); \
     } while(0)
 
 #elif defined(__AVR_ATtiny167__) \