diff options
author | Tom Lane | 2019-01-24 22:02:09 +0000 |
---|---|---|
committer | Tom Lane | 2019-01-24 22:02:09 +0000 |
commit | e3565fd61cee16414a682d2be0d44c112a80a30c (patch) | |
tree | 4e9cfa01c3ba898b932369b4bac3257e2fc0bbe1 /src/interfaces/ecpg/test/expected/thread-alloc.c | |
parent | d5a1fde397269bd60b99e70a4eb2934b75fd31ec (diff) |
Remove _configthreadlocale() calls in ecpg test suite.
This essentially reverts commits a772624b1 and 04fbe0e45, which
added "_configthreadlocale(_ENABLE_PER_THREAD_LOCALE)" calls to the
thread-related ecpg test programs. That was nothing but a hack,
because we shouldn't expect that ecpg-using applications have
done that for us; and now that we've inserted such calls into
ecpglib, the tests should still pass without it.
(If they don't, it would be good to know that.)
HEAD only; there seems no big need to change this in the
back branches.
Discussion: https://postgr.es/m/[email protected]
Diffstat (limited to 'src/interfaces/ecpg/test/expected/thread-alloc.c')
-rw-r--r-- | src/interfaces/ecpg/test/expected/thread-alloc.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/interfaces/ecpg/test/expected/thread-alloc.c b/src/interfaces/ecpg/test/expected/thread-alloc.c index e7b69b387f7..9678ebe6fd6 100644 --- a/src/interfaces/ecpg/test/expected/thread-alloc.c +++ b/src/interfaces/ecpg/test/expected/thread-alloc.c @@ -145,48 +145,42 @@ static void* fn(void* arg) #line 43 "alloc.pgc" -#ifdef WIN32 -#ifdef _MSC_VER /* requires MSVC */ - _configthreadlocale(_ENABLE_PER_THREAD_LOCALE); -#endif -#endif - value = (long)arg; sprintf(name, "Connection: %d", value); { ECPGconnect(__LINE__, 0, "ecpg1_regression" , NULL, NULL , name, 0); -#line 54 "alloc.pgc" +#line 48 "alloc.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 54 "alloc.pgc" +#line 48 "alloc.pgc" { ECPGsetcommit(__LINE__, "on", NULL); -#line 55 "alloc.pgc" +#line 49 "alloc.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 55 "alloc.pgc" +#line 49 "alloc.pgc" for (i = 1; i <= REPEATS; ++i) { { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select relname from pg_class where relname = 'pg_class'", ECPGt_EOIT, ECPGt_char,&(r),(long)0,(long)0,(1)*sizeof(char), ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); -#line 58 "alloc.pgc" +#line 52 "alloc.pgc" if (sqlca.sqlcode == ECPG_NOT_FOUND) sqlprint(); -#line 58 "alloc.pgc" +#line 52 "alloc.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 58 "alloc.pgc" +#line 52 "alloc.pgc" free(r); r = NULL; } { ECPGdisconnect(__LINE__, name); -#line 62 "alloc.pgc" +#line 56 "alloc.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 62 "alloc.pgc" +#line 56 "alloc.pgc" return 0; |