[dhcp-agent-commits] dhcp-agent/src dhcp-local.h,1.4,1.5 dhcp-option-convert.c,1.3,1.4

[<act...@us...>]

Update of /cvsroot/dhcp-agent/dhcp-agent/src
In directory sc8-pr-cvs1:/tmp/cvs-serv13305/src

Modified Files:
	dhcp-local.h dhcp-option-convert.c 
Log Message:
better portability for C99 inttypes macros

Index: dhcp-local.h
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-local.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dhcp-local.h	16 Nov 2002 00:23:43 -0000	1.4
--- dhcp-local.h	18 May 2003 02:58:25 -0000	1.5
***************
*** 62,67 ****
  
  
! #ifdef HAVE_PRIMACROS_H
! #include <primacros.h>
  #endif                          /* HAVE_PRIMACROS_H */
  
--- 62,67 ----
  
  
! #ifdef HAVE_STDINT_MARCOS_H
! #include <stdint_marcos.h>
  #endif                          /* HAVE_PRIMACROS_H */
  
***************
*** 69,72 ****
--- 69,76 ----
  #include <inttypes.h>
  #endif                          /* HAVE_INTTYPES_H */
+ 
+ #ifdef HAVE_STDINT_H
+ #include <stdint.h>
+ #endif                          /* HAVE_STDINT_H */
  
  #include <errno.h>

Index: dhcp-option-convert.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-option-convert.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dhcp-option-convert.c	6 May 2003 03:49:16 -0000	1.3
--- dhcp-option-convert.c	18 May 2003 02:58:25 -0000	1.4
***************
*** 949,955 ****
  
                  if(i < list_get_len(list)) {
!                     stringbuffer_aprintf(sb, "%"PRId8"%s", *int8_ptr, separator);
                  } else {
!                     stringbuffer_aprintf(sb, "%"PRId8, *int8_ptr);
                  }
                  break;
--- 949,955 ----
  
                  if(i < list_get_len(list)) {
!                     stringbuffer_aprintf(sb, "%"PRIi8"%s", *int8_ptr, separator);
                  } else {
!                     stringbuffer_aprintf(sb, "%"PRIi8, *int8_ptr);
                  }
                  break;
***************
*** 961,967 ****
  
                  if(i < list_get_len(list)) {
!                     stringbuffer_aprintf(sb, "%"PRId16"%s", *int16_ptr, separator);
                  } else {
!                     stringbuffer_aprintf(sb, "%"PRId16, *int16_ptr);
                  }
                  break;
--- 961,967 ----
  
                  if(i < list_get_len(list)) {
!                     stringbuffer_aprintf(sb, "%"PRIi16"%s", *int16_ptr, separator);
                  } else {
!                     stringbuffer_aprintf(sb, "%"PRIi16, *int16_ptr);
                  }
                  break;
***************
*** 973,979 ****
  
                  if(i < list_get_len(list)) {
!                     stringbuffer_aprintf(sb, "%"PRId32"%s", *int32_ptr, separator);
                  } else {
!                     stringbuffer_aprintf(sb, "%"PRId32, *int32_ptr);
                  }
                  break;
--- 973,979 ----
  
                  if(i < list_get_len(list)) {
!                     stringbuffer_aprintf(sb, "%"PRIi32"%s", *int32_ptr, separator);
                  } else {
!                     stringbuffer_aprintf(sb, "%"PRIi32, *int32_ptr);
                  }
                  break;