From: idgay <idgay>
Date: Mon, 22 Sep 2008 20:55:19 +0000 (+0000)
Subject: switch to __
X-Git-Tag: rc_6_tinyos_2_1_1~609
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=0f407fd97e55857074a757c584aaf09e873581e7

switch to __
---

diff --git a/support/make/avr/avr.rules b/support/make/avr/avr.rules
index 708a4ab6..b28b740f 100644
--- a/support/make/avr/avr.rules
+++ b/support/make/avr/avr.rules
@@ -36,11 +36,9 @@ PROGRAMMER ?= uisp
 NCC = ncc
 LIBS = -lm
 
-AMADDR = ActiveMessageAddressC\$$addr
-# Uncomment the next two lines if you have a toolchain without the dollar sign
-# patch. This needs nesc 1.2.8 or newer (1.2.9 is recommended).
-#PFLAGS += -fnesc-separator=__
-#AMADDR = ActiveMessageAddressC__addr
+# Use __ as the separator - requires nesC 1.2.9 or later
+PFLAGS += -fnesc-separator=__
+AMADDR = ActiveMessageAddressC__addr
 BUILDDIR ?= build/$(PLATFORM)
 MAIN_EXE = $(BUILDDIR)/main.exe
 MAIN_SREC = $(BUILDDIR)/main.srec