[Opendlm-cvs] opendlm/src/user/dlmdu dlm_cmdline.c,1.10,1.11 dlm_config.c,1.6,1.7 dlm_daemon.c,1.10,1.11 dlm_device.c,1.8,1.9

[<cao...@us...>]

Update of /cvsroot/opendlm/opendlm/src/user/dlmdu
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5108/src/user/dlmdu

Modified Files:
	dlm_cmdline.c dlm_config.c dlm_daemon.c dlm_device.c 
Log Message:
Header and CCCP cleanups

Index: dlm_cmdline.c
===================================================================
RCS file: /cvsroot/opendlm/opendlm/src/user/dlmdu/dlm_cmdline.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** dlm_cmdline.c	3 Jun 2005 19:27:17 -0000	1.10
--- dlm_cmdline.c	8 Jul 2005 16:17:12 -0000	1.11
***************
*** 47,62 ****
  #include "dlm_log.h"
  
  #include <stdio.h>
  #include <string.h>
  #include <sys/resource.h>
  
- #include "dlm.h"
- #include "dlm_kernel.h"
- #include "dlm_version.h"
  #include "clmstructs.h"
- #include "dlm_log.h"
- 
- 
- #undef LOCK_FREE
  
  /* ============================================================ */
--- 47,56 ----
  #include "dlm_log.h"
  
+ #include <stdlib.h>
  #include <stdio.h>
  #include <string.h>
  #include <sys/resource.h>
  
  #include "clmstructs.h"
  
  /* ============================================================ */

Index: dlm_config.c
===================================================================
RCS file: /cvsroot/opendlm/opendlm/src/user/dlmdu/dlm_config.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** dlm_config.c	3 Jun 2005 19:27:17 -0000	1.6
--- dlm_config.c	8 Jul 2005 16:17:12 -0000	1.7
***************
*** 57,64 ****
  #include <string.h>
  
- #include "dlm_cluster.h"
  #include "clmstructs.h"
  #include "dlm_devmsg.h"
- #include "dlm_kernel.h"
  #include "dlm_log.h"
  
--- 57,62 ----

Index: dlm_daemon.c
===================================================================
RCS file: /cvsroot/opendlm/opendlm/src/user/dlmdu/dlm_daemon.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** dlm_daemon.c	3 Jun 2005 19:27:17 -0000	1.10
--- dlm_daemon.c	8 Jul 2005 16:17:12 -0000	1.11
***************
*** 116,120 ****
  #include <stdlib.h>
  #include <string.h>
- #include <unistd.h>
  #include <errno.h>
  #include <sys/stat.h>
--- 116,119 ----
***************
*** 126,133 ****
  #endif /* !DIRECT_CLUSTINT */
  
- #include "dlm.h"
  #include "dlm_devmsg.h"
! #include "dlm_kernel.h"
! #include "cltrc.h"
  #include "dlm_list.h"
  #include "dlm_log.h"
--- 125,130 ----
  #endif /* !DIRECT_CLUSTINT */
  
  #include "dlm_devmsg.h"
! #include "clmstructs.h"
  #include "dlm_list.h"
  #include "dlm_log.h"
***************
*** 985,988 ****
--- 982,987 ----
   * removed from the "end" of the list.
   */
+ #define TRUE 1
+ #define FALSE 0
  bool_t dlm_notify_deliver(int nodeid, struct in_addr saddr, char *hostname, 
  			haDLM_state_t node_state, haDLM_state_t comm_state)

Index: dlm_device.c
===================================================================
RCS file: /cvsroot/opendlm/opendlm/src/user/dlmdu/dlm_device.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** dlm_device.c	3 Jun 2005 19:27:17 -0000	1.8
--- dlm_device.c	8 Jul 2005 16:17:12 -0000	1.9
***************
*** 59,64 ****
  #include "config.h"
  
  #include <stdio.h>
- #include <sys/stat.h>
  #include <fcntl.h>
  #include <string.h>
--- 59,64 ----
  #include "config.h"
  
+ #include <stdlib.h>
  #include <stdio.h>
  #include <fcntl.h>
  #include <string.h>
***************
*** 66,70 ****
  
  #include "clmstructs.h"
- #include "dlm_kernel.h"
  #include "dlm_log.h"
  
--- 66,69 ----