From 6d837d54c36fbe0d770594b8c7128f04dcd21f0e Mon Sep 17 00:00:00 2001 From: Moe Jette <jette1@llnl.gov> Date: Tue, 19 Nov 2002 19:17:46 +0000 Subject: [PATCH] Minor code clean-up, no logic changes. --- src/common/xsignal.c | 6 +++--- src/common/xstring.c | 12 ++++++++---- src/common/xstring.h | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/common/xsignal.c b/src/common/xsignal.c index 53d7a96ad44..a9ddde8247b 100644 --- a/src/common/xsignal.c +++ b/src/common/xsignal.c @@ -25,14 +25,14 @@ \*****************************************************************************/ #if HAVE_CONFIG_H -# include <config.h> +# include "config.h" #endif #include <errno.h> #include <signal.h> -#include <src/common/log.h> -#include <src/common/slurm_errno.h> +#include "src/common/log.h" +#include "src/common/slurm_errno.h" void diff --git a/src/common/xstring.c b/src/common/xstring.c index d23d3803d6e..3c7d3be7167 100644 --- a/src/common/xstring.c +++ b/src/common/xstring.c @@ -4,8 +4,8 @@ ****************************************************************************** * Copyright (C) 2002 The Regents of the University of California. * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). - * Written by Mark Grondona <grondona@llnl.gov>, Jim Garlick <garlick@llnl.gov>, - * et. al. + * Written by Mark Grondona <grondona@llnl.gov>, + * Jim Garlick <garlick@llnl.gov>, et. al. * UCRL-CODE-2002-040. * * This file is part of SLURM, a resource management program. @@ -39,13 +39,17 @@ #if HAVE_UNISTD_H # include <unistd.h> #endif -#include <pthread.h> + +#ifdef WITH_PTHREADS +# include <pthread.h> +#endif + #include <xmalloc.h> #include <xstring.h> #include <strlcpy.h> #include <xassert.h> -#include <src/common/slurm_errno.h> +#include "src/common/slurm_errno.h" #define XFGETS_CHUNKSIZE 64 diff --git a/src/common/xstring.h b/src/common/xstring.h index 6e0c0375dd6..e1679b4436e 100644 --- a/src/common/xstring.h +++ b/src/common/xstring.h @@ -28,7 +28,7 @@ #ifndef _XSTRING_H #define _XSTRING_H 1 -#include <src/common/macros.h> +#include "src/common/macros.h" #define xstrcat(__p, __q) _xstrcat(&(__p), __q) #define xstrcatchar(__p, __c) _xstrcatchar(&(__p), __c) -- GitLab