Include <stdlib.h> instead of <malloc.h>. This avoids a compiler error
on some systems caused by the definition of malloc in opal_config_bottom.h getting expanded in the system malloc.h when OPAL_ENABLE_MEM_DEBUG is set to 1. This commit was SVN r24210.
Этот коммит содержится в:
родитель
58445f3775
Коммит
82054cb02c
@ -44,7 +44,7 @@ const char *ibv_get_sysfs_path(void);
|
|||||||
#endif
|
#endif
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <malloc.h>
|
#include <stdlib.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
|
||||||
#include "opal/mca/event/event.h"
|
#include "opal/mca/event/event.h"
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2008 Chelsio, Inc. All rights reserved.
|
* Copyright (c) 2008 Chelsio, Inc. All rights reserved.
|
||||||
* Copyright (c) 2008-2010 Cisco Systems, Inc. All rights reserved.
|
* Copyright (c) 2008-2010 Cisco Systems, Inc. All rights reserved.
|
||||||
|
* Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
|
||||||
*
|
*
|
||||||
* Additional copyrights may follow
|
* Additional copyrights may follow
|
||||||
*
|
*
|
||||||
@ -15,7 +16,7 @@
|
|||||||
|
|
||||||
#if OMPI_HAVE_RDMACM
|
#if OMPI_HAVE_RDMACM
|
||||||
#include <rdma/rdma_cma.h>
|
#include <rdma/rdma_cma.h>
|
||||||
#include <malloc.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#include "opal/util/argv.h"
|
#include "opal/util/argv.h"
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
* Copyright (c) 2007-2008 Chelsio, Inc. All rights reserved.
|
* Copyright (c) 2007-2008 Chelsio, Inc. All rights reserved.
|
||||||
* Copyright (c) 2008 Mellanox Technologies. All rights reserved.
|
* Copyright (c) 2008 Mellanox Technologies. All rights reserved.
|
||||||
* Copyright (c) 2009 Sandia National Laboratories. All rights reserved.
|
* Copyright (c) 2009 Sandia National Laboratories. All rights reserved.
|
||||||
|
* Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
|
||||||
*
|
*
|
||||||
* $COPYRIGHT$
|
* $COPYRIGHT$
|
||||||
*
|
*
|
||||||
@ -41,7 +42,6 @@
|
|||||||
#ifdef HAVE_DIRENT_H
|
#ifdef HAVE_DIRENT_H
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
#endif
|
#endif
|
||||||
#include <malloc.h>
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
|
||||||
#include "opal/util/output.h"
|
#include "opal/util/output.h"
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user