fix for GCC15

source/bforce/prot_emsi.c

@@ -286,9 +286,9 @@ static int sm_tx_waitseq(s_tx_emsidat *d)
 
 static s_states st_tx_emsidat[] =
 {
-	{ "sm_tx_init",		sm_tx_init	},
-	{ "sm_tx_senddat",	sm_tx_senddat	},
-	{ "sm_tx_waitseq",	sm_tx_waitseq	}
+	{ "sm_tx_init",		(int (*)(void *))sm_tx_init	},
+	{ "sm_tx_senddat",	(int (*)(void *))sm_tx_senddat	},
+	{ "sm_tx_waitseq",	(int (*)(void *))sm_tx_waitseq	}
 };
 
 int emsi_send_emsidat(s_emsi *local_emsi)
@@ -570,10 +570,10 @@ static int sm_rx_getdat(s_rx_emsidat *d)
 
 static s_states st_rx_emsidat[] =
 {
-	{ "sm_rx_init",		sm_rx_init	},
-	{ "sm_rx_sendnak",	sm_rx_sendnak	},
-	{ "sm_rx_waitseq",	sm_rx_waitseq   },
-	{ "sm_rx_getdat",	sm_rx_getdat    }
+	{ "sm_rx_init",		(int (*)(void *))sm_rx_init	},
+	{ "sm_rx_sendnak",	(int (*)(void *))sm_rx_sendnak	},
+	{ "sm_rx_waitseq",	(int (*)(void *))sm_rx_waitseq   },
+	{ "sm_rx_getdat",	(int (*)(void *))sm_rx_getdat    }
 };
 
 int emsi_recv_emsidat(s_emsi *remote_emsi)

source/bforce/u_misc.c

@@ -253,10 +253,10 @@ int checkmasks(const char *masks, const char *str)
  */
 char *buffer_putlong(char *buffer, long val)
 {
-	buffer[0] = ( ((uint_least32_t) val)       ) & 0xff;
-	buffer[1] = ( ((uint_least32_t) val) >> 8  ) & 0xff;
-	buffer[2] = ( ((uint_least32_t) val) >> 16 ) & 0xff;
-	buffer[3] = ( ((uint_least32_t) val) >> 24 ) & 0xff;
+	buffer[0] = ( ((unsigned long) val)       ) & 0xff;
+	buffer[1] = ( ((unsigned long) val) >> 8  ) & 0xff;
+	buffer[2] = ( ((unsigned long) val) >> 16 ) & 0xff;
+	buffer[3] = ( ((unsigned long) val) >> 24 ) & 0xff;
 	
 	return buffer;
 }
@@ -273,8 +273,8 @@ char *buffer_putlong(char *buffer, long val)
  */
 char *buffer_putint(char *buffer, int val)
 {
-	buffer[0] = ( ((uint_least16_t) val)       ) & 0xff;
-	buffer[1] = ( ((uint_least16_t) val) >> 8  ) & 0xff;
+	buffer[0] = ( ((unsigned int) val)       ) & 0xff;
+	buffer[1] = ( ((unsigned int) val) >> 8  ) & 0xff;
 	
 	return buffer;
 }
@@ -290,10 +290,10 @@ char *buffer_putint(char *buffer, int val)
  */
 long buffer_getlong(const char *buffer)
 {
-	return (long)( (uint_least32_t) ((unsigned char) buffer[0])       )
-	           | ( (uint_least32_t) ((unsigned char) buffer[1]) << 8  )
-	           | ( (uint_least32_t) ((unsigned char) buffer[2]) << 16 )
-	           | ( (uint_least32_t) ((unsigned char) buffer[3]) << 24 );
+	return (long)( (unsigned long) ((unsigned char) buffer[0])       )
+	           | ( (unsigned long) ((unsigned char) buffer[1]) << 8  )
+	           | ( (unsigned long) ((unsigned char) buffer[2]) << 16 )
+	           | ( (unsigned long) ((unsigned char) buffer[3]) << 24 );
 }
 
 /*****************************************************************************
@@ -307,8 +307,8 @@ long buffer_getlong(const char *buffer)
  */
 int buffer_getint(const char *buffer)
 {
-	return (int)( (uint_least16_t) ((unsigned char) buffer[0])      )
-	          | ( (uint_least16_t) ((unsigned char) buffer[1]) << 8 );
+	return (int)( (unsigned int) ((unsigned char) buffer[0])      )
+	          | ( (unsigned int) ((unsigned char) buffer[1]) << 8 );
 }
 
 void swap_long(char *buffer){

source/include/prot_emsi.h

@@ -72,7 +72,7 @@
 struct states
 {
 const	char *st_name;
-	int (*proc)();
+	int (*proc)(void *);
 };
 typedef struct states s_states;