Skip to content

Commit

Permalink
all: use "" instead of <> for including hwloc headers
Browse files Browse the repository at this point in the history
Most compilers don't care about the difference, but some Android SDKs do.

Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
  • Loading branch information
bgoglin committed Apr 18, 2019
1 parent 83a8902 commit 5a227e4
Show file tree
Hide file tree
Showing 133 changed files with 381 additions and 360 deletions.
3 changes: 2 additions & 1 deletion contrib/misc/hwloc-tweak-osindex.c
Expand Up @@ -8,7 +8,8 @@
* with respect to their cpusets.
*/

#include <hwloc.h>
#include "hwloc.h"

#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
Expand Down
3 changes: 2 additions & 1 deletion doc/examples/cpuset+bitmap+cpubind.c
Expand Up @@ -7,7 +7,8 @@
* See COPYING in top-level directory.
*/

#include <hwloc.h>
#include "hwloc.h"

#include <errno.h>
#include <stdio.h>
#include <string.h>
Expand Down
2 changes: 1 addition & 1 deletion doc/examples/get-knl-modes.c
Expand Up @@ -11,7 +11,7 @@
#include <stdio.h>
#include <stdlib.h>

#include <hwloc.h>
#include "hwloc.h"

int main(void)
{
Expand Down
3 changes: 2 additions & 1 deletion doc/examples/gpu.c
Expand Up @@ -9,7 +9,8 @@
* See COPYING in top-level directory.
*/

#include <hwloc.h>
#include "hwloc.h"

#include <errno.h>
#include <stdio.h>
#include <string.h>
Expand Down
3 changes: 2 additions & 1 deletion doc/examples/hwloc-hello.c
Expand Up @@ -11,7 +11,8 @@
* hwloc-hello.c
*/

#include <hwloc.h>
#include "hwloc.h"

#include <errno.h>
#include <stdio.h>
#include <string.h>
Expand Down
3 changes: 2 additions & 1 deletion doc/examples/nodeset+membind+policy.c
Expand Up @@ -7,7 +7,8 @@
* See COPYING in top-level directory.
*/

#include <hwloc.h>
#include "hwloc.h"

#include <errno.h>
#include <stdio.h>
#include <string.h>
Expand Down
3 changes: 2 additions & 1 deletion doc/examples/sharedcaches.c
Expand Up @@ -5,7 +5,8 @@
* See COPYING in top-level directory.
*/

#include <hwloc.h>
#include "hwloc.h"

#include <errno.h>
#include <stdio.h>
#include <string.h>
Expand Down
2 changes: 1 addition & 1 deletion hwloc/base64.c
Expand Up @@ -11,7 +11,7 @@
/* include hwloc's config before anything else
* so that extensions and features are properly enabled
*/
#include <private/private.h>
#include "private/private.h"

/* $OpenBSD: base64.c,v 1.5 2006/10/21 09:55:03 otto Exp $ */

Expand Down
9 changes: 5 additions & 4 deletions hwloc/bind.c
Expand Up @@ -6,10 +6,11 @@
* See COPYING in top-level directory.
*/

#include <private/autogen/config.h>
#include <hwloc.h>
#include <private/private.h>
#include <hwloc/helper.h>
#include "private/autogen/config.h"
#include "hwloc.h"
#include "private/private.h"
#include "hwloc/helper.h"

#ifdef HAVE_SYS_MMAN_H
# include <sys/mman.h>
#endif
Expand Down
14 changes: 7 additions & 7 deletions hwloc/bitmap.c
Expand Up @@ -6,13 +6,13 @@
* See COPYING in top-level directory.
*/

#include <private/autogen/config.h>
#include <hwloc/autogen/config.h>
#include <hwloc.h>
#include <private/misc.h>
#include <private/private.h>
#include <private/debug.h>
#include <hwloc/bitmap.h>
#include "private/autogen/config.h"
#include "hwloc/autogen/config.h"
#include "hwloc.h"
#include "private/misc.h"
#include "private/private.h"
#include "private/debug.h"
#include "hwloc/bitmap.h"

#include <stdarg.h>
#include <stdio.h>
Expand Down
12 changes: 6 additions & 6 deletions hwloc/components.c
Expand Up @@ -4,11 +4,11 @@
* See COPYING in top-level directory.
*/

#include <private/autogen/config.h>
#include <hwloc.h>
#include <private/private.h>
#include <private/xml.h>
#include <private/misc.h>
#include "private/autogen/config.h"
#include "hwloc.h"
#include "private/private.h"
#include "private/xml.h"
#include "private/misc.h"

#define HWLOC_COMPONENT_STOP_NAME "stop"
#define HWLOC_COMPONENT_EXCLUDE_CHAR '-'
Expand Down Expand Up @@ -310,7 +310,7 @@ hwloc_disc_component_register(struct hwloc_disc_component *component,
return 0;
}

#include <static-components.h>
#include "static-components.h"

static void (**hwloc_component_finalize_cbs)(unsigned long);
static unsigned hwloc_component_finalize_cb_count;
Expand Down
6 changes: 3 additions & 3 deletions hwloc/diff.c
Expand Up @@ -3,9 +3,9 @@
* See COPYING in top-level directory.
*/

#include <private/autogen/config.h>
#include <private/private.h>
#include <private/misc.h>
#include "private/autogen/config.h"
#include "private/private.h"
#include "private/misc.h"

int hwloc_topology_diff_destroy(hwloc_topology_diff_t diff)
{
Expand Down
10 changes: 5 additions & 5 deletions hwloc/distances.c
Expand Up @@ -5,11 +5,11 @@
* See COPYING in top-level directory.
*/

#include <private/autogen/config.h>
#include <hwloc.h>
#include <private/private.h>
#include <private/debug.h>
#include <private/misc.h>
#include "private/autogen/config.h"
#include "hwloc.h"
#include "private/private.h"
#include "private/debug.h"
#include "private/misc.h"

#include <float.h>
#include <math.h>
Expand Down
6 changes: 3 additions & 3 deletions hwloc/misc.c
Expand Up @@ -6,9 +6,9 @@
* See COPYING in top-level directory.
*/

#include <private/autogen/config.h>
#include <private/private.h>
#include <private/misc.h>
#include "private/autogen/config.h"
#include "private/private.h"
#include "private/misc.h"

#include <stdarg.h>
#ifdef HAVE_SYS_UTSNAME_H
Expand Down
12 changes: 6 additions & 6 deletions hwloc/pci-common.c
Expand Up @@ -3,12 +3,12 @@
* See COPYING in top-level directory.
*/

#include <private/autogen/config.h>
#include <hwloc.h>
#include <hwloc/plugins.h>
#include <private/private.h>
#include <private/debug.h>
#include <private/misc.h>
#include "private/autogen/config.h"
#include "hwloc.h"
#include "hwloc/plugins.h"
#include "private/private.h"
#include "private/debug.h"
#include "private/misc.h"

#include <fcntl.h>
#ifdef HAVE_UNISTD_H
Expand Down
8 changes: 4 additions & 4 deletions hwloc/shmem.c
Expand Up @@ -3,10 +3,10 @@
* See COPYING in top-level directory.
*/

#include <private/autogen/config.h>
#include <hwloc.h>
#include <hwloc/shmem.h>
#include <private/private.h>
#include "private/autogen/config.h"
#include "hwloc.h"
#include "hwloc/shmem.h"
#include "private/private.h"

#ifndef HWLOC_WIN_SYS

Expand Down
10 changes: 5 additions & 5 deletions hwloc/topology-aix.c
Expand Up @@ -8,7 +8,7 @@

/* TODO: use SIGRECONFIG & dr_reconfig for state change */

#include <private/autogen/config.h>
#include "private/autogen/config.h"

#include <sys/types.h>
#ifdef HAVE_DIRENT_H
Expand All @@ -23,10 +23,10 @@
#include <sys/stat.h>
#include <fcntl.h>

#include <hwloc.h>
#include <private/private.h>
#include <private/misc.h>
#include <private/debug.h>
#include "hwloc.h"
#include "private/private.h"
#include "private/misc.h"
#include "private/debug.h"

#include <procinfo.h>
#include <sys/types.h>
Expand Down
9 changes: 4 additions & 5 deletions hwloc/topology-bgq.c
Expand Up @@ -3,11 +3,10 @@
* See COPYING in top-level directory.
*/

#include <private/autogen/config.h>

#include <hwloc.h>
#include <private/private.h>
#include <private/debug.h>
#include "private/autogen/config.h"
#include "hwloc.h"
#include "private/private.h"
#include "private/debug.h"

#include <stdlib.h>
#include <pthread.h>
Expand Down
12 changes: 6 additions & 6 deletions hwloc/topology-cuda.c
Expand Up @@ -4,14 +4,14 @@
* See COPYING in top-level directory.
*/

#include <private/autogen/config.h>
#include <hwloc.h>
#include <hwloc/plugins.h>
#include <hwloc/cudart.h>
#include "private/autogen/config.h"
#include "hwloc.h"
#include "hwloc/plugins.h"
#include "hwloc/cudart.h"

/* private headers allowed for convenience because this plugin is built within hwloc */
#include <private/misc.h>
#include <private/debug.h>
#include "private/misc.h"
#include "private/debug.h"

#include <cuda_runtime_api.h>

Expand Down
8 changes: 4 additions & 4 deletions hwloc/topology-darwin.c
Expand Up @@ -11,16 +11,16 @@

/* Apparently, Darwin people do not _want_ to provide binding functions. */

#include <private/autogen/config.h>
#include "private/autogen/config.h"

#include <sys/types.h>
#include <sys/sysctl.h>
#include <stdlib.h>
#include <inttypes.h>

#include <hwloc.h>
#include <private/private.h>
#include <private/debug.h>
#include "hwloc.h"
#include "private/private.h"
#include "private/debug.h"

static int
hwloc_look_darwin(struct hwloc_backend *backend, struct hwloc_disc_status *dstatus __hwloc_attribute_unused)
Expand Down
6 changes: 3 additions & 3 deletions hwloc/topology-fake.c
Expand Up @@ -3,9 +3,9 @@
* See COPYING in top-level directory.
*/

#include <private/autogen/config.h>
#include <hwloc.h>
#include <private/private.h>
#include "private/autogen/config.h"
#include "hwloc.h"
#include "private/private.h"

#include <stdlib.h>

Expand Down
8 changes: 4 additions & 4 deletions hwloc/topology-freebsd.c
Expand Up @@ -6,7 +6,7 @@
* See COPYING in top-level directory.
*/

#include <private/autogen/config.h>
#include "private/autogen/config.h"

#include <sys/types.h>
#include <stdlib.h>
Expand All @@ -23,9 +23,9 @@
#include <sys/sysctl.h>
#endif

#include <hwloc.h>
#include <private/private.h>
#include <private/debug.h>
#include "hwloc.h"
#include "private/private.h"
#include "private/debug.h"

#if defined(HAVE_SYS_CPUSET_H) && defined(HAVE_CPUSET_SETAFFINITY)
static void
Expand Down
10 changes: 5 additions & 5 deletions hwloc/topology-gl.c
Expand Up @@ -4,13 +4,13 @@
* See COPYING in top-level directory.
*/

#include <private/autogen/config.h>
#include <hwloc.h>
#include <hwloc/plugins.h>
#include "private/autogen/config.h"
#include "hwloc.h"
#include "hwloc/plugins.h"

/* private headers allowed for convenience because this plugin is built within hwloc */
#include <private/misc.h>
#include <private/debug.h>
#include "private/misc.h"
#include "private/debug.h"

#include <stdarg.h>
#include <errno.h>
Expand Down
7 changes: 3 additions & 4 deletions hwloc/topology-hardwired.c
Expand Up @@ -3,10 +3,9 @@
* See COPYING in top-level directory.
*/

#include <private/autogen/config.h>

#include <hwloc.h>
#include <private/private.h>
#include "private/autogen/config.h"
#include "hwloc.h"
#include "private/private.h"

int hwloc_look_hardwired_fujitsu_k(struct hwloc_topology *topology)
{
Expand Down
8 changes: 4 additions & 4 deletions hwloc/topology-hpux.c
Expand Up @@ -15,7 +15,7 @@
pthread_pset_bind_np()
*/

#include <private/autogen/config.h>
#include "private/autogen/config.h"

#include <sys/types.h>
#ifdef HAVE_UNISTD_H
Expand All @@ -25,9 +25,9 @@
#include <errno.h>
#include <stdio.h>

#include <hwloc.h>
#include <private/private.h>
#include <private/debug.h>
#include "hwloc.h"
#include "private/private.h"
#include "private/debug.h"

#include <sys/mpctl.h>
#include <sys/mman.h>
Expand Down

0 comments on commit 5a227e4

Please sign in to comment.