[Dhcp-agent-commits] CVS: dhcp-agent acinclude.m4,1.3,1.4 aclocal.m4,1.3,1.4 configure,1.14,1.15 dhcp-agent.h,1.45,1.46 dhcp-client.c,1.21,1.22

[Thamer Al-H. <act...@us...>]

Update of /cvsroot/dhcp-agent/dhcp-agent
In directory usw-pr-cvs1:/tmp/cvs-serv26309

Modified Files:
	acinclude.m4 aclocal.m4 configure dhcp-agent.h dhcp-client.c 
Log Message:
second stab at generating our own primacros

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/acinclude.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** acinclude.m4	5 Jun 2002 03:00:59 -0000	1.3
--- acinclude.m4	5 Jun 2002 12:59:57 -0000	1.4
***************
*** 74,85 ****
  /* substitutions as we know them. */
  
! #define SUB_UNSIGNED_LONG "%lu"
! #define SUB_UNSIGNED_SHORT "%hu"
! #define SUB_LONG "%li"
! #define SUB_SHORT "%hi"
! #define SUB_INT   "%d"
! #define SUB_UNSIGNED_INT "%du"
! #define SUB_CHAR "%d"                 /* same -- we're assuming int is always bigger than char */
! #define SUB_UNSIGNED_CHAR "%du"       /* which is an OK assumption. */
  
  
--- 74,85 ----
  /* substitutions as we know them. */
  
! #define SUB_UNSIGNED_LONG "lu"
! #define SUB_UNSIGNED_SHORT "hu"
! #define SUB_LONG "li"
! #define SUB_SHORT "hi"
! #define SUB_INT   "d"
! #define SUB_UNSIGNED_INT "du"
! #define SUB_CHAR "d"                 /* same -- we're assuming int is always bigger than char */
! #define SUB_UNSIGNED_CHAR "du"       /* which is an OK assumption. */
  
  

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/aclocal.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** aclocal.m4	5 Jun 2002 03:00:59 -0000	1.3
--- aclocal.m4	5 Jun 2002 12:59:57 -0000	1.4
***************
*** 86,97 ****
  /* substitutions as we know them. */
  
! #define SUB_UNSIGNED_LONG "%lu"
! #define SUB_UNSIGNED_SHORT "%hu"
! #define SUB_LONG "%li"
! #define SUB_SHORT "%hi"
! #define SUB_INT   "%d"
! #define SUB_UNSIGNED_INT "%du"
! #define SUB_CHAR "%d"                 /* same -- we're assuming int is always bigger than char */
! #define SUB_UNSIGNED_CHAR "%du"       /* which is an OK assumption. */
  
  
--- 86,97 ----
  /* substitutions as we know them. */
  
! #define SUB_UNSIGNED_LONG "lu"
! #define SUB_UNSIGNED_SHORT "hu"
! #define SUB_LONG "li"
! #define SUB_SHORT "hi"
! #define SUB_INT   "d"
! #define SUB_UNSIGNED_INT "du"
! #define SUB_CHAR "d"                 /* same -- we're assuming int is always bigger than char */
! #define SUB_UNSIGNED_CHAR "du"       /* which is an OK assumption. */
  
  

Index: configure
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/configure,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** configure	5 Jun 2002 03:00:59 -0000	1.14
--- configure	5 Jun 2002 12:59:57 -0000	1.15
***************
*** 2450,2461 ****
  /* substitutions as we know them. */
  
! #define SUB_UNSIGNED_LONG "%lu"
! #define SUB_UNSIGNED_SHORT "%hu"
! #define SUB_LONG "%li"
! #define SUB_SHORT "%hi"
! #define SUB_INT   "%d"
! #define SUB_UNSIGNED_INT "%du"
! #define SUB_CHAR "%d"                 /* same -- we're assuming int is always bigger than char */
! #define SUB_UNSIGNED_CHAR "%du"       /* which is an OK assumption. */
  
  static void output_type_substitution(FILE *fp,
--- 2450,2461 ----
  /* substitutions as we know them. */
  
! #define SUB_UNSIGNED_LONG "lu"
! #define SUB_UNSIGNED_SHORT "hu"
! #define SUB_LONG "li"
! #define SUB_SHORT "hi"
! #define SUB_INT   "d"
! #define SUB_UNSIGNED_INT "du"
! #define SUB_CHAR "d"                 /* same -- we're assuming int is always bigger than char */
! #define SUB_UNSIGNED_CHAR "du"       /* which is an OK assumption. */
  
  static void output_type_substitution(FILE *fp,

Index: dhcp-agent.h
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-agent.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** dhcp-agent.h	5 Jun 2002 03:00:59 -0000	1.45
--- dhcp-agent.h	5 Jun 2002 12:59:58 -0000	1.46
***************
*** 35,46 ****
  # include <stdio.h>
  
- #if defined(HAVE_GETOPT_H)
- # include <getopt.h>
- #endif
- 
- #ifdef HAVE_PRIMACROS_H
- #include <primacros.h>
- #endif /* HAVE_PRIMACROS_H */
- 
  # include <sys/types.h>
  # include <sys/time.h>
--- 35,38 ----
***************
*** 64,67 ****
--- 56,71 ----
  
  # include <config.h>
+ 
+ #if defined(HAVE_GETOPT_H)
+ 
+ # include <getopt.h>
+ 
+ #endif /* HAVE_GETOPT_H */
+ 
+ #ifdef HAVE_PRIMACROS_H
+ 
+ #include <primacros.h>
+ 
+ #endif /* HAVE_PRIMACROS_H */
  
  #if defined(HAVE_STDARG_H)

Index: dhcp-client.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-client.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** dhcp-client.c	3 Jun 2002 01:36:04 -0000	1.21
--- dhcp-client.c	5 Jun 2002 12:59:58 -0000	1.22
***************
*** 206,210 ****
       * the cache.  We need a client cache structure though, pass
       * it a dummy structure with the interface. That's all it
!      * needs.  (this is the hack).
       */
      
--- 206,210 ----
       * the cache.  We need a client cache structure though, pass
       * it a dummy structure with the interface. That's all it
!      * needs. (this a hack).
       */