database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-27 07:42:10 +03:00
Code Activity

Fix C++ incompatibilities in ecpg/preproc/ header files.

Browse Source 
There's probably no need to back-patch this, since it seems unlikely
that anybody would be inserting C++ code into ecpg's preprocessor.

Discussion: https://postgr.es/m/b517ec3918d645eb950505eac8dd434e@gaz-is.ru
This commit is contained in:
Tom Lane
2019-05-31 12:38:53 -04:00
parent 3f61b3205f
commit 4f67858d3f
3 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/interfaces/ecpg/preproc/ecpg.c
View File

@@ -99,13 +99,13 @@ add_preprocessor_define(char *define)
/* symbol has a value */
for (tmp = ptr - 1; *tmp == ' '; tmp--);
tmp[1] = '\0';
defines->old = define_copy;
defines->new = ptr + 1;
defines->olddef = define_copy;
defines->newdef = ptr + 1;
}
else
{
defines->old = define_copy;
defines->new = mm_strdup("1");
defines->olddef = define_copy;
defines->newdef = mm_strdup("1");
}
defines->pertinent = true;
defines->used = NULL;
@@ -410,8 +410,8 @@ main(int argc, char *const argv[])
defptr = defines;
defines = defines->next;
free(defptr->new);
free(defptr->old);
free(defptr->newdef);
free(defptr->olddef);
free(defptr);
}
@@ -423,8 +423,8 @@ main(int argc, char *const argv[])
{
defptr->next = this->next;
free(this->new);
free(this->old);
free(this->newdef);
free(this->olddef);
free(this);
}
}