-fnative-integers -> -fnative-types
git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@322 59561ff5-6e30-0410-9f3c-9617f08c8826
diff --git a/asn1c/asn1c.1 b/asn1c/asn1c.1
index f2c3677..8d7cf06 100644
--- a/asn1c/asn1c.1
+++ b/asn1c/asn1c.1
@@ -27,7 +27,7 @@
.TP
\fILanguage Options\fR
.br
-\fB\-fall-defs-global \-fbless-SIZE \-fnative-integers \-funnamed-unions \-ftypes88\fR
+\fB\-fall-defs-global \-fbless-SIZE \-fnative-types \-funnamed-unions \-ftypes88\fR
.TP
\fIOutput Options\fR
.br
@@ -87,9 +87,9 @@
constraint is normally prohibited by the standard. This is a violation of
an ASN.1 standard and compiler may fail to produce the meaningful code.
.TP
-.B \-fnative-integers
-Use native machine's integer types whenever possible,
-instead of the complex ASN.1 INTEGER and ENUMERATED types.
+.B \-fnative-types
+Use the native machine's data types (int, double) whenever possible,
+instead of the compound ASN.1 INTEGER_t, ENUMERATED_t and REAL_t types.
.TP
.B \-funnamed-unions
Enable unnamed unions in the definitions of target language's structures.
diff --git a/asn1c/asn1c.c b/asn1c/asn1c.c
index d84d864..9dd5dde 100644
--- a/asn1c/asn1c.c
+++ b/asn1c/asn1c.c
@@ -63,7 +63,9 @@
ret = asn1f_make_known_external_type(known_type);
assert(ret == 0 || errno == EEXIST);
} else if(strcmp(optarg, "native-integers") == 0) {
- asn1_compiler_flags |= A1C_USE_NATIVE_INTEGERS;
+ asn1_compiler_flags |= A1C_USE_NATIVE_TYPES;
+ } else if(strcmp(optarg, "native-types") == 0) {
+ asn1_compiler_flags |= A1C_USE_NATIVE_TYPES;
} else if(strcmp(optarg, "unnamed-unions") == 0) {
asn1_compiler_flags |= A1C_UNNAMED_UNIONS;
} else if(strcmp(optarg, "types88") == 0) {
@@ -289,7 +291,7 @@
" -fall-defs-global Don't make the asn1_DEF_'s of structure members \"static\"\n"
" -fbless-SIZE Allow SIZE() constraint for INTEGER etc (non-std.)\n"
" -fknown-extern-type=<name> Pretend this type is known\n"
-" -fnative-integers Use int instead of INTEGER_t whenever possible\n"
+" -fnative-types Use \"int\" instead of INTEGER_t whenever possible\n"
" -funnamed-unions Enable unnamed unions in structures\n"
" -ftypes88 Use only ASN.1:1988 embedded types\n"
"\n"
diff --git a/doc/asn1c-usage.lyx b/doc/asn1c-usage.lyx
index ad3d121..dd0dbfb 100644
--- a/doc/asn1c-usage.lyx
+++ b/doc/asn1c-usage.lyx
@@ -55,7 +55,7 @@
\layout Standard
\backslash
-extramarks{$Revision$ -- describes asn1c-0.9.3}{}
+extramarks{$Revision$ -- describes asn1c-0.9.5}{}
\end_inset
@@ -1117,7 +1117,7 @@
\emph on
--fnative-integers
+-fnative-types
\emph default
compiler option is used to produce basic C
\emph on
@@ -1648,7 +1648,7 @@
\layout Standard
--fnative-integers
+-fnative-types
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
@@ -1658,8 +1658,8 @@
\size small
-Use native machine's integer types whenever possible, instead of the complex
- ASN.1 INTEGER and ENUMERATED types.
+Use the native machine's data types (int, double) whenever possible, instead
+ of the compound ASN.1 INTEGER_t, ENUMERATED_t and REAL_t types.
\end_inset
</cell>
diff --git a/doc/asn1c-usage.pdf b/doc/asn1c-usage.pdf
index 105671c..6a22d22 100644
--- a/doc/asn1c-usage.pdf
+++ b/doc/asn1c-usage.pdf
Binary files differ