Compiles with ZDS-II

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@540 42af7a65-404d-4744-a932-0658087f49c3

2 files changed, 13 insertions, 15 deletions

diff --git a/nuttx/arch/z16/include/types.h b/nuttx/arch/z16/include/types.h
index 760790327..60b81c716 100644
--- a/nuttx/arch/z16/include/types.h
+++ b/nuttx/arch/z16/include/types.h
@@ -1,7 +1,7 @@
-/************************************************************
+/****************************************************************************
  * arch/types.h
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- ************************************************************/
+ ****************************************************************************/
 
 /* This file should never be included directed but, rather,
  * only indirectly through sys/types.h
@@ -40,17 +40,17 @@
 #ifndef __ARCH_TYPES_H
 #define __ARCH_TYPES_H
 
-/************************************************************
+/****************************************************************************
  * Included Files
- ************************************************************/
+ ****************************************************************************/
 
-/************************************************************
+/****************************************************************************
  * Definitions
- ************************************************************/
+ ****************************************************************************/
 
-/************************************************************
+/****************************************************************************
  * Type Declarations
- ************************************************************/
+ ****************************************************************************/
 
 #ifndef __ASSEMBLY__
 
@@ -64,8 +64,6 @@ typedef short sint16;
 typedef unsigned short uint16;
 typedef int sint32;
 typedef unsigned int uint32;
-typedef long long sint64;
-typedef unsigned long long uint64;
 
 /* This is the size of the interrupt state save returned by
  * irqsave()
@@ -75,8 +73,8 @@ typedef unsigned int irqstate_t;
 
 #endif /* __ASSEMBLY__ */
 
-/************************************************************
+/****************************************************************************
  * Global Function Prototypes
- ************************************************************/
+ ****************************************************************************/
 
 #endif /* __ARCH_TYPES_H */
diff --git a/nuttx/arch/z16/src/Makefile b/nuttx/arch/z16/src/Makefile
index f2bf572fc..2ce3a3013 100644
--- a/nuttx/arch/z16/src/Makefile
+++ b/nuttx/arch/z16/src/Makefile
@@ -82,7 +82,7 @@ libarch$(LIBEXT): $(OBJS)
 board/libboard$(LIBEXT):
 	$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT)
 
-nuttx: $(HEAD_AOBJ) board/libboard$(LIBEXT)
+nuttx$(EXEEXT): $(HEAD_AOBJ) board/libboard$(LIBEXT)
 	$(LD) --entry=__start $(LDFLAGS) $(LDPATHES) -L$(BOARDDIR) -o $(TOPDIR)/$@ $(HEAD_AOBJ) \
 		--start-group $(LDLIBS) -lboard --end-group $(EXTRA_LIBS) $(LIBGCC)