diff options
| author | Thomas Schuetz | 2012-06-19 05:13:27 +0000 |
|---|---|---|
| committer | Thomas Schuetz | 2012-06-19 05:13:27 +0000 |
| commit | b890c411ed018ddb97cfea3961f0e763579c39d0 (patch) | |
| tree | 4f06e64cf6f72a580b92d227e75aed45d3b68c69 /runtime/org.eclipse.etrice.runtime.c/src/platforms | |
| parent | 9ef262ce6b7a76e03014c855b3cf6c8e18b655a2 (diff) | |
| download | org.eclipse.etrice-b890c411ed018ddb97cfea3961f0e763579c39d0.tar.gz org.eclipse.etrice-b890c411ed018ddb97cfea3961f0e763579c39d0.tar.xz org.eclipse.etrice-b890c411ed018ddb97cfea3961f0e763579c39d0.zip | |
[runtime.c] removed boolean from etDatatypes for conflicts with windows
datatypes
Diffstat (limited to 'runtime/org.eclipse.etrice.runtime.c/src/platforms')
| -rw-r--r-- | runtime/org.eclipse.etrice.runtime.c/src/platforms/generic/etDatatypes.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/platforms/generic/etDatatypes.h b/runtime/org.eclipse.etrice.runtime.c/src/platforms/generic/etDatatypes.h index aac2ec338..ef9ba469b 100644 --- a/runtime/org.eclipse.etrice.runtime.c/src/platforms/generic/etDatatypes.h +++ b/runtime/org.eclipse.etrice.runtime.c/src/platforms/generic/etDatatypes.h @@ -38,9 +38,13 @@ typedef long long int64; typedef float float32;
typedef double float64;
+/* string datatypes */
+typedef char* charPtr;
+
/* boolean datatypes and values */
typedef char bool; /* TODO: bool, Bool, Boolean, and boolean are already defined in some platforms*/
-typedef bool boolean;
+//typedef bool boolean;
+
#ifndef TRUE
#define TRUE 1
#endif
|