diff --git a/asn1c/asn1c.1 b/asn1c/asn1c.1 index f2c3677e..8d7cf061 100644 --- a/asn1c/asn1c.1 +++ b/asn1c/asn1c.1 @@ -27,7 +27,7 @@ and other encoding standards. .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 @@ Allow SIZE() constraint for INTEGER, ENUMERATED, and other types for which this 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 d84d8642..9dd5dde3 100644 --- a/asn1c/asn1c.c +++ b/asn1c/asn1c.c @@ -63,7 +63,9 @@ main(int ac, char **av) { 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 @@ usage(char *av0) { " -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= 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 ad3d1217..dd0dbfb2 100644 --- a/doc/asn1c-usage.lyx +++ b/doc/asn1c-usage.lyx @@ -55,7 +55,7 @@ status Open \layout Standard \backslash -extramarks{$Revision$ -- describes asn1c-0.9.3}{} +extramarks{$Revision$ -- describes asn1c-0.9.5}{} \end_inset @@ -1117,7 +1117,7 @@ collapsed false \emph on --fnative-integers +-fnative-types \emph default compiler option is used to produce basic C \emph on @@ -1648,7 +1648,7 @@ Allow SIZE() constraint for INTEGER, ENUMERATED, and other types for which \layout Standard --fnative-integers +-fnative-types \end_inset @@ -1658,8 +1658,8 @@ Allow SIZE() constraint for INTEGER, ENUMERATED, and other types for which \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 diff --git a/doc/asn1c-usage.pdf b/doc/asn1c-usage.pdf index 105671c0..6a22d225 100644 Binary files a/doc/asn1c-usage.pdf and b/doc/asn1c-usage.pdf differ