[Openais] [patch 10/13] Now that -I is set correctly we can use #include <some.h> instead of using quotes and relative paths.

Steven Dake sdake at redhat.com
Sun Sep 9 00:07:18 PDT 2007


merged.
regards
-steve
On Fri, 2007-08-24 at 11:53 +0200, beekhof at gmail.com wrote:
> plain text document attachment (headers.patch)
> Requires: bug-Makefile.patch
> ---
>  include/ipc_gen.h |    2 +-
>  include/mar_gen.h |    4 ++--
>  lib/amf.c         |    8 ++++----
>  lib/cfg.c         |   10 +++++-----
>  lib/ckpt.c        |   14 +++++++-------
>  lib/clm.c         |   14 +++++++-------
>  lib/cpg.c         |    8 ++++----
>  lib/evs.c         |    8 ++++----
>  lib/evt.c         |    4 ++--
>  lib/lck.c         |   10 +++++-----
>  lib/msg.c         |   10 +++++-----
>  lib/util.c        |    4 ++--
>  12 files changed, 48 insertions(+), 48 deletions(-)
> 
> Index: include/ipc_gen.h
> ===================================================================
> --- include/ipc_gen.h.orig	2007-08-23 19:38:36.000000000 +0200
> +++ include/ipc_gen.h	2007-08-23 21:00:43.000000000 +0200
> @@ -34,7 +34,7 @@
>  #ifndef IPC_GEN_H_DEFINED
>  #define IPC_GEN_H_DEFINED
>  
> -#include "mar_gen.h"
> +#include <mar_gen.h>
>  
>  enum service_types {
>  	EVS_SERVICE = 0,
> Index: include/mar_gen.h
> ===================================================================
> --- include/mar_gen.h.orig	2007-08-23 19:38:36.000000000 +0200
> +++ include/mar_gen.h	2007-08-23 21:00:43.000000000 +0200
> @@ -43,8 +43,8 @@
>  #endif
>  #include <string.h>
>  
> -#include "saAis.h"
> -#include "swab.h"
> +#include <saAis.h>
> +#include <swab.h>
>  
>  typedef int8_t mar_int8_t;
>  typedef int16_t mar_int16_t;
> Index: lib/amf.c
> ===================================================================
> --- lib/amf.c.orig	2007-08-23 19:38:36.000000000 +0200
> +++ lib/amf.c	2007-08-23 21:00:43.000000000 +0200
> @@ -45,10 +45,10 @@
>  #include <sys/select.h>
>  #include <sys/un.h>
>  
> -#include "../include/saAis.h"
> -#include "../include/saAmf.h"
> -#include "../include/ipc_gen.h"
> -#include "../include/ipc_amf.h"
> +#include <saAis.h>
> +#include <saAmf.h>
> +#include <ipc_gen.h>
> +#include <ipc_amf.h>
>  #include "util.h"
>  
> 
> Index: lib/cfg.c
> ===================================================================
> --- lib/cfg.c.orig	2007-08-23 19:38:36.000000000 +0200
> +++ lib/cfg.c	2007-08-23 21:00:43.000000000 +0200
> @@ -46,11 +46,11 @@
>  #include <sys/select.h>
>  #include <sys/un.h>
>  
> -#include "../include/saAis.h"
> -#include "../include/cfg.h"
> -#include "../include/mar_gen.h"
> -#include "../include/ipc_gen.h"
> -#include "../include/ipc_cfg.h"
> +#include <saAis.h>
> +#include <cfg.h>
> +#include <mar_gen.h>
> +#include <ipc_gen.h>
> +#include <ipc_cfg.h>
>  #include "util.h"
>  
>  struct res_overlay {
> Index: lib/ckpt.c
> ===================================================================
> --- lib/ckpt.c.orig	2007-08-23 19:38:36.000000000 +0200
> +++ lib/ckpt.c	2007-08-23 21:00:43.000000000 +0200
> @@ -46,13 +46,13 @@
>  #include <sys/select.h>
>  #include <sys/un.h>
>  
> -#include "../include/saAis.h"
> -#include "../include/list.h"
> -#include "../include/saCkpt.h"
> -#include "../include/mar_gen.h"
> -#include "../include/mar_ckpt.h"
> -#include "../include/ipc_gen.h"
> -#include "../include/ipc_ckpt.h"
> +#include <saAis.h>
> +#include <list.h>
> +#include <saCkpt.h>
> +#include <mar_gen.h>
> +#include <mar_ckpt.h>
> +#include <ipc_gen.h>
> +#include <ipc_ckpt.h>
>  
>  #include "util.h"
>  
> Index: lib/clm.c
> ===================================================================
> --- lib/clm.c.orig	2007-08-23 19:38:36.000000000 +0200
> +++ lib/clm.c	2007-08-23 21:01:30.000000000 +0200
> @@ -45,14 +45,14 @@
>  #include <sys/select.h>
>  #include <sys/un.h>
>  
> -#include "../include/swab.h"
> +#include <swab.h>
>  #include "../exec/totem.h"
> -#include "../include/saAis.h"
> -#include "../include/saClm.h"
> -#include "../include/ipc_gen.h"
> -#include "../include/ipc_clm.h"
> -#include "../include/mar_gen.h"
> -#include "../include/mar_clm.h"
> +#include <saAis.h>
> +#include <saClm.h>
> +#include <ipc_gen.h>
> +#include <ipc_clm.h>
> +#include <mar_gen.h>
> +#include <mar_clm.h>
>  
>  #include "util.h"
>  
> Index: lib/cpg.c
> ===================================================================
> --- lib/cpg.c.orig	2007-08-23 19:38:36.000000000 +0200
> +++ lib/cpg.c	2007-08-23 21:00:43.000000000 +0200
> @@ -45,10 +45,10 @@
>  #include <sys/socket.h>
>  #include <errno.h>
>  
> -#include "../include/saAis.h"
> -#include "../include/cpg.h"
> -#include "../include/ipc_cpg.h"
> -#include "../include/mar_cpg.h"
> +#include <saAis.h>
> +#include <cpg.h>
> +#include <ipc_cpg.h>
> +#include <mar_cpg.h>
>  #include "util.h"
>  
>  struct cpg_inst {
> Index: lib/evs.c
> ===================================================================
> --- lib/evs.c.orig	2007-08-23 19:38:36.000000000 +0200
> +++ lib/evs.c	2007-08-23 21:00:43.000000000 +0200
> @@ -46,11 +46,11 @@
>  #include <sys/socket.h>
>  #include <errno.h>
>  
> -#include "../include/swab.h"
> +#include <swab.h>
>  #include "../exec/totem.h"
> -#include "../include/saAis.h"
> -#include "../include/evs.h"
> -#include "../include/ipc_evs.h"
> +#include <saAis.h>
> +#include <evs.h>
> +#include <ipc_evs.h>
>  #include "util.h"
>  
>  struct evs_inst {
> Index: lib/evt.c
> ===================================================================
> --- lib/evt.c.orig	2007-08-23 19:38:36.000000000 +0200
> +++ lib/evt.c	2007-08-23 21:00:43.000000000 +0200
> @@ -39,10 +39,10 @@
>  #include <unistd.h>
>  #include <sys/time.h>
>  #include <sys/socket.h>
> -#include "../include/ipc_evt.h"
> +#include <ipc_evt.h>
>  #include "util.h"
>  #include "../exec/totem.h"
> -#include "../include/list.h"
> +#include <list.h>
>  
>  static void evtHandleInstanceDestructor(void *instance);
>  static void chanHandleInstanceDestructor(void *instance);
> Index: lib/lck.c
> ===================================================================
> --- lib/lck.c.orig	2007-08-23 19:38:36.000000000 +0200
> +++ lib/lck.c	2007-08-23 21:00:43.000000000 +0200
> @@ -45,11 +45,11 @@
>  #include <sys/select.h>
>  #include <sys/un.h>
>  
> -#include "../include/saAis.h"
> -#include "../include/list.h"
> -#include "../include/saLck.h"
> -#include "../include/ipc_gen.h"
> -#include "../include/ipc_lck.h"
> +#include <saAis.h>
> +#include <list.h>
> +#include <saLck.h>
> +#include <ipc_gen.h>
> +#include <ipc_lck.h>
>  
>  #include "util.h"
>  
> Index: lib/msg.c
> ===================================================================
> --- lib/msg.c.orig	2007-08-23 19:38:36.000000000 +0200
> +++ lib/msg.c	2007-08-23 21:00:43.000000000 +0200
> @@ -45,11 +45,11 @@
>  #include <sys/select.h>
>  #include <sys/un.h>
>  
> -#include "../include/saAis.h"
> -#include "../include/list.h"
> -#include "../include/saMsg.h"
> -#include "../include/ipc_gen.h"
> -#include "../include/ipc_msg.h"
> +#include <saAis.h>
> +#include <list.h>
> +#include <saMsg.h>
> +#include <ipc_gen.h>
> +#include <ipc_msg.h>
>  
>  #include "util.h"
>  
> Index: lib/util.c
> ===================================================================
> --- lib/util.c.orig	2007-08-23 19:38:36.000000000 +0200
> +++ lib/util.c	2007-08-23 21:00:43.000000000 +0200
> @@ -53,8 +53,8 @@
>  #include <netinet/in.h>
>  #include <assert.h>
>  
> -#include "../include/saAis.h"
> -#include "../include/ipc_gen.h"
> +#include <saAis.h>
> +#include <ipc_gen.h>
>  #include "util.h"
>  
>  enum SA_HANDLE_STATE {
> 



More information about the Openais mailing list