Commit820a0a6

committed

Merge branch 'master' into pgpro-2065

2 parents702d13e +fb4c3ff commit820a0a6Copy full SHA for 820a0a6

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -134,13 +134,13 @@ exit_if_necessary(int elevel)`
`134`	`134`	`/* If this is not the main thread then don't call exit() */`
`135`	`135`	`if (main_tid!=pthread_self())`
`136`	`136`	`{`
	`137`	`+/* Interrupt other possible routines */`
	`138`	`+thread_interrupted= true;`
`137`	`139`	`#ifdefWIN32`
`138`	`140`	`ExitThread(elevel);`
`139`	`141`	`#else`
`140`	`142`	`pthread_exit(NULL);`
`141`	`143`	`#endif`
`142`		`-/* Interrupt other possible routines */`
`143`		`-thread_interrupted= true;`
`144`	`144`	`}`
`145`	`145`	`else`
`146`	`146`	`exit(elevel);`

Comments

(0)