Imported msp430-libc-20100207

[msp430-libc.git] / include / msp430 / adc12.h

diff --git a/include/msp430/adc12.h b/include/msp430/adc12.h
index fb4ace6a181793b7d8230d257722c92d8e4271f9..215d2ee75719bd22d55b86e79d36d0124458ede9 100644 (file)
--- a/include/msp430/adc12.h
+++ b/include/msp430/adc12.h
@@ -9,7 +9,7 @@
  * (c) 2002 by M. P. Ashton <data@ieee.org>
  * Originally based in part on work by Texas Instruments Inc.
  *
- * $Id: adc12.h,v 1.10 2006/01/12 00:47:21 cliechti Exp $
+ * $Id: adc12.h,v 1.11 2008/10/09 15:00:14 sb-sf Exp $
  */
 
 /* Switches: none */
@@ -25,7 +25,7 @@ sfrw(ADC12IE,ADC12IE_);
 #define ADC12IV_            0x01A8  /* ADC12 Interrupt Vector Word */
 sfrw(ADC12IV,ADC12IV_);
 
-#ifndef _GNU_ASSEMBLER_
+#ifndef __ASSEMBLER__
 /* Structured declaration */
 typedef struct {
   volatile unsigned
@@ -91,7 +91,7 @@ struct adc12_t adc12 asm("0x01A0");
 #endif
 
 #define ADC12MEM_           0x0140  /* ADC12 Conversion Memory */
-#ifdef _GNU_ASSEMBLER_
+#ifdef __ASSEMBLER__
 #define ADC12MEM            ADC12MEM_ /* ADC12 Conversion Memory (for assembler) */
 #else
 #define ADC12MEM            ((int*) ADC12MEM_) /* ADC12 Conversion Memory (for C) */
@@ -130,7 +130,7 @@ sfrw(ADC12MEM14,ADC12MEM14_);
 sfrw(ADC12MEM15,ADC12MEM15_);
 
 #define ADC12MCTL_          0x0080  /* ADC12 Memory Control */
-#ifdef _GNU_ASSEMBLER_
+#ifdef __ASSEMBLER__
 #define ADC12MCTL           ADC12MCTL_ /* ADC12 Memory Control (for assembler) */
 #else
 #define ADC12MCTL           ((char*) ADC12MCTL_) /* ADC12 Memory Control (for C) */