zrzk
/
px4_autopilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fix bad AVR C++ include paths; remove stray typo from ctypes.h 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5024 7fd9a85b-ad96-42d3-883c-3090e2eb8679
sbg
patacongo 13 years ago
parent
18669722d8
commit
d5c4c4da8d
9 changed files with 22 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      nuttx/ChangeLog
  2. 6
      nuttx/configs/amber/hello/Make.defs
  3. 6
      nuttx/configs/micropendous3/hello/Make.defs
  4. 2
      nuttx/configs/micropendous3/hello/defconfig
  5. 6
      nuttx/configs/teensy/hello/Make.defs
  6. 6
      nuttx/configs/teensy/nsh/Make.defs
  7. 2
      nuttx/configs/teensy/nsh/defconfig
  8. 6
      nuttx/configs/teensy/usbstorage/Make.defs
  9. 2
      nuttx/include/ctype.h

4
nuttx/ChangeLog
Unescape View File

@ -3160,3 +3160,7 @@ @@ -3160,3 +3160,7 @@
by POSIX.
* include/sys/types.h: Define NULL to be (0) if __cplusplus is defined.
(contributed by Mike Smith)
* include/ctype.h: Remove a stray semi-colon in a definitions (Thanks
Mike Smith).
* configs/.../Make.defs. Fix C++ include path set-up in Make.defs file
for all 8-bit AVR platforms (Thanks Richard Cochran).

6
nuttx/configs/amber/hello/Make.defs
Unescape View File

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
############################################################################
# configs/amber/hello/Make.defs
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -68,7 +68,7 @@ ifeq ($(WINTOOL),y) @@ -68,7 +68,7 @@ ifeq ($(WINTOOL),y)
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = $(ARCHINCLUDES) -w $(TOPDIR)/include/cxx}"
ARCHXXINCLUDES = $(ARCHINCLUDES) "${shell cygpath -w $(TOPDIR)/include/cxx}"
ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/hello/ld.script}"
else
# Linux/Cygwin-native toolchain

6
nuttx/configs/micropendous3/hello/Make.defs
Unescape View File

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
############################################################################
# configs/micropendous3/hello/Make.defs
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -68,7 +68,7 @@ ifeq ($(WINTOOL),y) @@ -68,7 +68,7 @@ ifeq ($(WINTOOL),y)
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = $(ARCHINCLUDES) -w $(TOPDIR)/include/cxx}"
ARCHXXINCLUDES = $(ARCHINCLUDES) "${shell cygpath -w $(TOPDIR)/include/cxx}"
ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/hello/ld.script}"
else
# Linux/Cygwin-native toolchain

2
nuttx/configs/micropendous3/hello/defconfig
Unescape View File

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
# configs/micropendous3/hello/defconfig
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions

6
nuttx/configs/teensy/hello/Make.defs
Unescape View File

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
############################################################################
# configs/teensy/hello/Make.defs
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -68,7 +68,7 @@ ifeq ($(WINTOOL),y) @@ -68,7 +68,7 @@ ifeq ($(WINTOOL),y)
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = $(ARCHINCLUDES) -w $(TOPDIR)/include/cxx}"
ARCHXXINCLUDES = $(ARCHINCLUDES) "${shell cygpath -w $(TOPDIR)/include/cxx}"
ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/hello/ld.script}"
else
# Linux/Cygwin-native toolchain

6
nuttx/configs/teensy/nsh/Make.defs
Unescape View File

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
############################################################################
# configs/teensy/nsh/Make.defs
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -68,7 +68,7 @@ ifeq ($(WINTOOL),y) @@ -68,7 +68,7 @@ ifeq ($(WINTOOL),y)
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = $(ARCHINCLUDES) -w $(TOPDIR)/include/cxx}"
ARCHXXINCLUDES = $(ARCHINCLUDES) "${shell cygpath -w $(TOPDIR)/include/cxx}"
ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script}"
else
# Linux/Cygwin-native toolchain

2
nuttx/configs/teensy/nsh/defconfig
Unescape View File

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
# configs/teensy/nsh/defconfig
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions

6
nuttx/configs/teensy/usbstorage/Make.defs
Unescape View File

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
############################################################################
# configs/teensy/usbstorage/Make.defs
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -68,7 +68,7 @@ ifeq ($(WINTOOL),y) @@ -68,7 +68,7 @@ ifeq ($(WINTOOL),y)
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = $(ARCHINCLUDES) -w $(TOPDIR)/include/cxx}"
ARCHXXINCLUDES = $(ARCHINCLUDES) "${shell cygpath -w $(TOPDIR)/include/cxx}"
ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/usbstorage/ld.script}"
else
# Linux/Cygwin-native toolchain

2
nuttx/include/ctype.h
Unescape View File

@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
*
****************************************************************************/
#define isascii(c) ((c) >= 0 && (c) <= 0x7f);
#define isascii(c) ((c) >= 0 && (c) <= 0x7f)
/****************************************************************************
* Name: isprint

Write Preview
Loading…
Cancel
Save