projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged from external project:
[bertos.git]
/
bertos
/
drv
/
wdt.h
diff --git
a/bertos/drv/wdt.h
b/bertos/drv/wdt.h
index 4b1e6a914f0b1643948ede16276145811f15b14e..55b74264f535dc13d269c894c341197c208d45c2 100644
(file)
--- a/
bertos/drv/wdt.h
+++ b/
bertos/drv/wdt.h
@@
-32,7
+32,7
@@
*
* \version $Id$
*
*
* \version $Id$
*
- * \author Bern
ardo Innocenti <bernie@develer.com
>
+ * \author Bern
ie Innocenti <bernie@codewiz.org
>
*
* \brief Watchdog interface
*/
*
* \brief Watchdog interface
*/
@@
-40,9
+40,9
@@
#ifndef DRV_WDT_H
#define DRV_WDT_H
#ifndef DRV_WDT_H
#define DRV_WDT_H
-#include
<cfg/cfg_wdt.h>
+#include
"cfg/cfg_wdt.h"
#include <cfg/compiler.h> // INLINE
#include <cfg/compiler.h> // INLINE
-#include
<cfg/cfg_arch.h>
+#include
"cfg/cfg_arch.h"
/* Configury sanity check */
#if !defined(CONFIG_WATCHDOG) || (CONFIG_WATCHDOG != 0 && CONFIG_WATCHDOG != 1)
/* Configury sanity check */
#if !defined(CONFIG_WATCHDOG) || (CONFIG_WATCHDOG != 0 && CONFIG_WATCHDOG != 1)
@@
-54,11
+54,7
@@
#include <cfg/os.h>
#if OS_QT
#include <cfg/os.h>
#if OS_QT
- #if _QT < 4
- #include <qapplication.h>
- #else
#include <QtGui/QApplication>
#include <QtGui/QApplication>
- #endif
#elif OS_POSIX
#include <sys/select.h>
#elif CPU_AVR
#elif OS_POSIX
#include <sys/select.h>
#elif CPU_AVR