fix for asprintf issue on linux - include ompi_config.h first
This commit was SVN r2241.
Этот коммит содержится в:
родитель
29592041ea
Коммит
300e4135ac
@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
include $(top_srcdir)/config/Makefile.options
|
include $(top_srcdir)/config/Makefile.options
|
||||||
AM_CPPFLAGS = -I$(top_srcdir)/test/support -DOMPI_ENABLE_DEBUG_OVERRIDE=1
|
AM_CPPFLAGS = -D__USE_GNU -I$(top_srcdir)/test/support -DOMPI_ENABLE_DEBUG_OVERRIDE=1
|
||||||
|
|
||||||
noinst_PROGRAMS = \
|
noinst_PROGRAMS = \
|
||||||
test_gpr_proxy \
|
test_gpr_proxy \
|
||||||
|
@ -10,6 +10,8 @@
|
|||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "ompi_config.h"
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
@ -17,7 +19,6 @@
|
|||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
|
|
||||||
#include "ompi_config.h"
|
|
||||||
#include "support.h"
|
#include "support.h"
|
||||||
|
|
||||||
#include "include/constants.h"
|
#include "include/constants.h"
|
||||||
@ -103,6 +104,7 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
/* if daemon seed - just wait for requests */
|
/* if daemon seed - just wait for requests */
|
||||||
if(ompi_process_info.seed) {
|
if(ompi_process_info.seed) {
|
||||||
|
#if 1
|
||||||
/* wait on child to exit */
|
/* wait on child to exit */
|
||||||
int pid = exec_client(argc, argv);
|
int pid = exec_client(argc, argv);
|
||||||
while(true) {
|
while(true) {
|
||||||
@ -111,6 +113,10 @@ int main(int argc, char **argv)
|
|||||||
break;
|
break;
|
||||||
ompi_event_loop(OMPI_EVLOOP_NONBLOCK);
|
ompi_event_loop(OMPI_EVLOOP_NONBLOCK);
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
fprintf(stderr, "setenv OMPI_MCA_oob_base_seed %s\n", mca_oob_get_contact_info());
|
||||||
|
ompi_event_loop(0);
|
||||||
|
#endif
|
||||||
return(0);
|
return(0);
|
||||||
} else {
|
} else {
|
||||||
return run_test();
|
return run_test();
|
||||||
|
@ -9,10 +9,10 @@
|
|||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "ompi_config.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "ompi_config.h"
|
|
||||||
#include "support.h"
|
#include "support.h"
|
||||||
|
|
||||||
#include "include/constants.h"
|
#include "include/constants.h"
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user