CVS: linux-atm/src/include .cvsignore, 1.1, 1.2 Makefile.am, 1.2, 1.3 atm.h, 1.2, 1.3 atmd.h, 1.2, 1.3 atmsap.h, 1.2, 1.3 stdint.h, 1.2, NONE

[chas w. <ch...@us...>]

Update of /cvsroot/linux-atm/linux-atm/src/include
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24942/src/include

Modified Files:
	Makefile.am atm.h atmd.h atmsap.h 
Added Files:
	.cvsignore 
Removed Files:
	stdint.h 
Log Message:
merge 2.5.0 branch into the head



Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/include/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	9 Oct 2001 22:33:06 -0000	1.2
--- Makefile.am	1 Jan 2008 00:14:50 -0000	1.3
***************
*** 1,3 ****
  include_HEADERS = atm.h atmd.h atmsap.h
- noinst_HEADERS = stdint.h
- 
--- 1 ----

Index: atm.h
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/include/atm.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** atm.h	9 Oct 2001 22:33:06 -0000	1.2
--- atm.h	1 Jan 2008 00:14:50 -0000	1.3
***************
*** 11,14 ****
--- 11,17 ----
  #include <linux/atm.h>
  
+ #ifdef  __cplusplus
+ extern "C" {
+ #endif
  
  /*
***************
*** 106,108 ****
--- 109,115 ----
  int __atmlib_fetch(const char **pos,...); /* internal use only */
  
+ #ifdef  __cplusplus
+ };
+ #endif
+ 
  #endif

Index: atmd.h
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/include/atmd.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** atmd.h	9 Oct 2001 22:33:06 -0000	1.2
--- atmd.h	1 Jan 2008 00:14:50 -0000	1.3
***************
*** 14,17 ****
--- 14,21 ----
  #include <sys/time.h>
  
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
  /* doubly linked list primitives */
   
***************
*** 199,201 ****
--- 203,209 ----
   */
  
+ #ifdef __cplusplus
+ };
+ #endif
+ 
  #endif

Index: atmsap.h
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/include/atmsap.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** atmsap.h	9 Oct 2001 22:33:06 -0000	1.2
--- atmsap.h	1 Jan 2008 00:14:50 -0000	1.3
***************
*** 10,13 ****
--- 10,16 ----
  #include <linux/atmsap.h>
  
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
  
  /*
***************
*** 43,45 ****
--- 46,52 ----
  void atm_tcpip_port_mapping(char *vs_id,uint8_t protocol,uint16_t port);
  
+ #ifdef __cplusplus
+ };
+ #endif
+ 
  #endif

--- stdint.h DELETED ---