X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=join.cpp;h=b3f8843b33a5423f3b18b36617dc35a9db032ec6;hp=2a1e0a7e70cb08f9d0a8ddf1cb3b1ee6cf61b05f;hb=89d3a5de4769faafa46efb83e1e35db5b40f1309;hpb=5a22e57828617abc14e27814ee918cc63b96fd46

diff --git a/join.cpp b/join.cpp
index 2a1e0a7..b3f8843 100644
--- a/join.cpp
+++ b/join.cpp
@@ -9,21 +9,12 @@
 **                                                                           **
 \*****************************************************************************/ 
 
-#include <stdio.h>
-//#include <string.h>
-//#include <stdlib.h>
-//#include <unistd.h>
-//#include <poll.h>
-//#include <sys/types.h>
-//#include <sys/stat.h>
-//#include <fcntl.h>
 #include "main.h"
 //#define __u8 unsigned char
 //#define __u16 unsigned short
-//#define __u32 unsigned long
-//#include "linux/isdnif.h"
+//#define __u32 unsigned int
 
-unsigned long join_serial = 1; /* must be 1, because 0== no join */
+unsigned int join_serial = 1; /* must be 1, because 0== no join */
 
 //JOIN_STATES
 
@@ -32,14 +23,14 @@ class Join *join_first = NULL;
 /*
  * find the join with join_id
  */ 
-class Join *find_join_id(unsigned long join_id)
+class Join *find_join_id(unsigned int join_id)
 {
 	class Join *join = join_first;
 
 	while(join)
 	{
-//printf("comparing: '%s' with '%s'\n", name, join->c_name);
-		if (join->c_serial == join_id)
+//printf("comparing: '%s' with '%s'\n", name, join->j_name);
+		if (join->j_serial == join_id)
 			return(join);
 		join = join->next;
 	}
@@ -55,8 +46,8 @@ Join::Join(void)
 {
 	class Join **joinp;
 
-	c_serial = join_serial++;
-	c_type = JOIN_TYPE_NONE;
+	j_serial = join_serial++;
+	j_type = JOIN_TYPE_NONE;
 
 	/* attach to chain */
 	next = NULL;
@@ -97,7 +88,7 @@ Join::~Join()
 /* epoint sends a message to a join
  *
  */
-void Join::message_epoint(unsigned long epoint_id, int message_type, union parameter *param)
+void Join::message_epoint(unsigned int epoint_id, int message_type, union parameter *param)
 {
 }