Fixed incorrect output for some structs.

diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index a1ee4c75f92c4982d0bfcc927ac774eb317dec85..a2a97d0df727d0bbe077b237b840921bf5a0c956 100644 (file)
--- a/src/interfaces/ecpg/ChangeLog
+++ b/src/interfaces/ecpg/ChangeLog
@@ -1441,6 +1441,10 @@ Fri May 23 11:46:15 CEST 2003
 
    - Synced parser and keyword table.
    - ecpg now accepts array elements as input variables.
+
+Tue May 27 13:29:28 CEST 2003
+
+   - Fixed incorrect output for some structs.
    - Set ecpg version to 2.12.0.
    - Set ecpg library to 3.4.2.
    - Set pgtypes library to 1.0.0

diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
index 0e7cea0eda24c5c4b9ab3615cec36afe24e433be..6f0aa04cc55db5a5eb2f323a909f6ce58c4d30a3 100644 (file)
--- a/src/interfaces/ecpg/preproc/preproc.y
+++ b/src/interfaces/ecpg/preproc/preproc.y
@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.y,v 1.222 2003/05/23 15:19:34 meskes Exp $ */
+/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.y,v 1.223 2003/05/27 11:31:52 meskes Exp $ */
 
 /* Copyright comment */
 %{
@@ -3783,8 +3783,6 @@ update_target_list:  update_target_list ',' update_target_el
            }
        | update_target_el
            { $$ = $1;  }
-       | '*'
-           { $$ = make_str("*"); }
        ;
 
 inf_col_list: ColId opt_indirection
@@ -4833,7 +4831,11 @@ s_struct_union_symbol: SQL_STRUCT symbol
        }
        ;
 
-s_struct_union: SQL_STRUCT { $$ = make_str("struct"); }
+s_struct_union: SQL_STRUCT 
+       {
+           ECPGstruct_sizeof = make_str(""); /* This must not be NULL to distinguish from simple types. */
+           $$ = make_str("struct");
+       }
        | UNION     { $$ = make_str("union"); }
        ;