Cleanup patches, a* categories.

Rename them to follow the make makepatch naming, and regenerate them.

With hat:	portmgr
Sponsored by:	Absolight

10 files changed, 59 insertions, 59 deletions

diff --git a/audio/xmms-nsf/files/patch-src__nes__audiosys.c b/audio/xmms-nsf/files/patch-src_nes_audiosys.c
index 17b39688c636..c8213d1c7575 100644
--- a/audio/xmms-nsf/files/patch-src__nes__audiosys.c
+++ b/audio/xmms-nsf/files/patch-src_nes_audiosys.c
@@ -1,5 +1,5 @@
---- ./src/nes/audiosys.c.orig	Sun Jan  7 05:17:57 2001
-+++ ./src/nes/audiosys.c	Wed Jan 10 20:10:34 2007
+--- src/nes/audiosys.c.orig	2001-01-07 04:17:57 UTC
++++ src/nes/audiosys.c
 @@ -8,8 +8,11 @@
  
  static NES_AUDIO_HANDLER *nah = 0;
@@ -13,7 +13,7 @@
  	while (buflen--)
  	{
  		NES_AUDIO_HANDLER *ph;
-@@ -31,9 +34,17 @@
+@@ -31,9 +34,17 @@ void NESAudioRender(Int16 *bufp, Uint bu
  			else
  				output = accum;
  			output >>= 8;
diff --git a/audio/xmms-nsf/files/patch-src__nes__audiosys.h b/audio/xmms-nsf/files/patch-src_nes_audiosys.h
index 396adb8183f0..fd6143b26039 100644
--- a/audio/xmms-nsf/files/patch-src__nes__audiosys.h
+++ b/audio/xmms-nsf/files/patch-src_nes_audiosys.h
@@ -1,6 +1,6 @@
---- ./src/nes/audiosys.h.orig	Sun Jan  7 05:17:56 2001
-+++ ./src/nes/audiosys.h	Wed Jan 10 20:10:34 2007
-@@ -21,7 +21,7 @@
+--- src/nes/audiosys.h.orig	2001-01-07 04:17:56 UTC
++++ src/nes/audiosys.h
+@@ -21,7 +21,7 @@ typedef struct NES_VOLUME_HANDLER_TAG {
  } NES_VOLUME_HANDLER;
  
  
diff --git a/audio/xmms-nsf/files/patch-src__nes__handler.c b/audio/xmms-nsf/files/patch-src_nes_handler.c
index 8c28ac55d005..8da5cc3e93f2 100644
--- a/audio/xmms-nsf/files/patch-src__nes__handler.c
+++ b/audio/xmms-nsf/files/patch-src_nes_handler.c
@@ -1,5 +1,5 @@
---- ./src/nes/handler.c.orig	Sun Jan  7 05:17:57 2001
-+++ ./src/nes/handler.c	Wed Jan 10 20:10:34 2007
+--- src/nes/handler.c.orig	2001-01-07 04:17:57 UTC
++++ src/nes/handler.c
 @@ -10,9 +10,9 @@
  static NES_READ_HANDLER  *(nprh[0x10]) = { 0, };
  static NES_WRITE_HANDLER *(npwh[0x10]) = { 0, };
@@ -12,7 +12,7 @@
  	do \
  	{ \
  		if (ph->min <= A && A <= ph->max) \
-@@ -22,9 +22,9 @@
+@@ -22,9 +22,9 @@ static Uint __fastcall ExtRd##p##(Uint A
  	} while ((ph = ph->next) != 0); \
  	return 0; \
  } \
diff --git a/audio/xmms-nsf/files/patch-src__nes__km6502__km6502cd.h b/audio/xmms-nsf/files/patch-src_nes_km6502_km6502cd.h
index 7dd3d0c0053c..6672373a40fe 100644
--- a/audio/xmms-nsf/files/patch-src__nes__km6502__km6502cd.h
+++ b/audio/xmms-nsf/files/patch-src_nes_km6502_km6502cd.h
@@ -1,6 +1,6 @@
---- ./src/nes/km6502/km6502cd.h.orig	Sun Jan  7 05:18:05 2001
-+++ ./src/nes/km6502/km6502cd.h	Wed Jan 10 20:10:34 2007
-@@ -361,27 +361,27 @@
+--- src/nes/km6502/km6502cd.h.orig	2001-01-07 04:18:05 UTC
++++ src/nes/km6502/km6502cd.h
+@@ -361,27 +361,27 @@ static void OpsubCall KM_TST(__CONTEXT_ 
  
  /* --- ADC ---  */
  #if BUILD_HUC6280
@@ -40,7 +40,7 @@
  #endif
  DEF_ADC(61,NP,KA_INDX)	/* 61 - ADC - (Indirect,X) */
  DEF_ADC(65,ZP,KA_ZP)	/* 65 - ADC - Zero Page */
-@@ -397,17 +397,17 @@
+@@ -397,17 +397,17 @@ DEF_ADC(72,NP,KA_IND)	/* 72 - ADC - (Ind
  
  /* --- AND ---  */
  #if BUILD_HUC6280
@@ -64,7 +64,7 @@
  #endif
  DEF_AND(21,NP,KA_INDX)	/* 21 - AND - (Indirect,X) */
  DEF_AND(25,ZP,KA_ZP)	/* 25 - AND - Zero Page */
-@@ -422,10 +422,10 @@
+@@ -422,10 +422,10 @@ DEF_AND(32,NP,KA_IND)	/* 32 - AND - (Ind
  #endif
  
  /* --- ASL ---  */
@@ -77,7 +77,7 @@
  }
  DEF_ASL(06,ZP,KA_ZP)	/* 06 - ASL - Zero Page */
  DEF_ASL(0E,NP,KA_ABS)	/* 0E - ASL - Absolute */
-@@ -436,7 +436,7 @@
+@@ -436,7 +436,7 @@ static void OpcodeCall Opcode0A(__CONTEX
  
  #if BUILD_HUC6280
  /* --- BBRi --- */
@@ -86,7 +86,7 @@
  { \
  	Uword adr = KA_ZP(__THISP); \
  	Uword rel = K_READ(__THISP_ KA_IMM(__THISP)); \
-@@ -451,7 +451,7 @@
+@@ -451,7 +451,7 @@ DEF_BBR(5F,5)			/* 5F - BBR5 */
  DEF_BBR(6F,6)			/* 6F - BBR6 */
  DEF_BBR(7F,7)			/* 7F - BBR7 */
  /* --- BBSi --- */
@@ -95,7 +95,7 @@
  { \
  	Uword adr = KA_ZP(__THISP); \
  	Uword rel = K_READ(__THISP_ KA_IMM(__THISP)); \
-@@ -468,8 +468,8 @@
+@@ -468,8 +468,8 @@ DEF_BBS(FF,7)			/* FF - BBS7 */
  #endif
  
  /* --- BIT ---  */
@@ -106,7 +106,7 @@
  DEF_BIT(24,ZP,KA_ZP)	/* 24 - BIT - Zero Page */
  DEF_BIT(2C,NP,KA_ABS)	/* 2C - BIT - Absolute */
  #if BUILD_HUC6280 || BUILD_M65C02
-@@ -479,7 +479,7 @@
+@@ -479,7 +479,7 @@ DEF_BIT(89,NP,KA_IMM)	/* 89 - BIT - Imme
  #endif
  
  /* --- Bcc ---  */
@@ -115,7 +115,7 @@
  { \
  	Uword rel = K_READ(__THISP_ KA_IMM(__THISP)); \
  	if (a) KM_BRA(__THISP_ rel); \
-@@ -536,8 +536,8 @@
+@@ -536,8 +536,8 @@ static void OpcodeCall OpcodeB8(__CONTEX
  { __THIS__.P &= ~V_FLAG; }
  
  /* --- CMP --- */
@@ -126,7 +126,7 @@
  DEF_CMP(C1,NP,KA_INDX)	/* C1 - CMP - (Indirect,X) */
  DEF_CMP(C5,ZP,KA_ZP)	/* C5 - CMP - Zero Page */
  DEF_CMP(C9,NP,KA_IMM)	/* C9 - CMP - Immediate */
-@@ -551,24 +551,24 @@
+@@ -551,24 +551,24 @@ DEF_CMP(D2,NP,KA_IND)	/* D2 - CMP - (Ind
  #endif
  
  /* --- CPX --- */
@@ -157,7 +157,7 @@
  }
  DEF_DEC(C6,ZP,KA_ZP)	/* C6 - DEC - Zero Page */
  DEF_DEC(CE,NP,KA_ABS)	/* CE - DEC - Absolute */
-@@ -585,17 +585,17 @@
+@@ -585,17 +585,17 @@ static void OpcodeCall Opcode88(__CONTEX
  
  /* --- EOR ---  */
  #if BUILD_HUC6280
@@ -181,7 +181,7 @@
  #endif
  DEF_EOR(41,NP,KA_INDX)	/* 41 - EOR - (Indirect,X) */
  DEF_EOR(45,ZP,KA_ZP)	/* 45 - EOR - Zero Page */
-@@ -610,10 +610,10 @@
+@@ -610,10 +610,10 @@ DEF_EOR(52,NP,KA_IND)	/* 52 - EOR - (Ind
  #endif
  
  /* --- INC ---  */
@@ -194,7 +194,7 @@
  }
  DEF_INC(E6,ZP,KA_ZP)	/* E6 - INC - Zero Page */
  DEF_INC(EE,NP,KA_ABS)	/* EE - INC - Absolute */
-@@ -629,12 +629,12 @@
+@@ -629,12 +629,12 @@ static void OpcodeCall OpcodeC8(__CONTEX
  { __THIS__.Y = KM_INC(__THISP_ __THIS__.Y); }
  
  /* --- JMP ---  */
@@ -209,7 +209,7 @@
  { __THIS__.PC = KI_READWORDBUG(__THISP_ a(__THISP)); }
  #endif
  DEF_JMP(4C,KA_IMM16)	/* 4C - JMP - Immediate */
-@@ -653,8 +653,8 @@
+@@ -653,8 +653,8 @@ static void OpcodeCall Opcode20(__CONTEX
  }
  
  /* --- LDA --- */
@@ -220,7 +220,7 @@
  DEF_LDA(A1,NP,KA_INDX)	/* A1 - LDA - (Indirect,X) */
  DEF_LDA(A5,ZP,KA_ZP)	/* A5 - LDA - Zero Page */
  DEF_LDA(A9,NP,KA_IMM)	/* A9 - LDA - Immediate */
-@@ -668,8 +668,8 @@
+@@ -668,8 +668,8 @@ DEF_LDA(B2,NP,KA_IND)	/* B2 - LDA - (Ind
  #endif
  
  /* --- LDX ---  */
@@ -231,7 +231,7 @@
  DEF_LDX(A2,NP,KA_IMM)	/* A2 - LDX - Immediate */
  DEF_LDX(A6,ZP,KA_ZP)	/* A6 - LDX - Zero Page */
  DEF_LDX(AE,NP,KA_ABS)	/* AE - LDX - Absolute */
-@@ -677,8 +677,8 @@
+@@ -677,8 +677,8 @@ DEF_LDX(B6,ZP,KA_ZPY)	/* B6 - LDX - Zero
  DEF_LDX(BE,NP,KA_ABSY_)	/* BE - LDX - Absolute,Y */
  
  /* --- LDY ---  */
@@ -242,7 +242,7 @@
  DEF_LDY(A0,NP,KA_IMM)	/* A0 - LDY - Immediate */
  DEF_LDY(A4,ZP,KA_ZP)	/* A4 - LDY - Zero Page */
  DEF_LDY(AC,NP,KA_ABS)	/* AC - LDY - Absolute */
-@@ -686,10 +686,10 @@
+@@ -686,10 +686,10 @@ DEF_LDY(B4,ZP,KA_ZPX)	/* B4 - LDY - Zero
  DEF_LDY(BC,NP,KA_ABSX_)	/* BC - LDY - Absolute,X */
  
  /* --- LSR ---  */
@@ -255,7 +255,7 @@
  }
  DEF_LSR(46,ZP,KA_ZP)	/* 46 - LSR - Zero Page */
  DEF_LSR(4E,NP,KA_ABS)	/* 4E - LSR - Absolute */
-@@ -705,17 +705,17 @@
+@@ -705,17 +705,17 @@ static void OpcodeCall OpcodeEA(__CONTEX
  
  /* --- ORA ---  */
  #if BUILD_HUC6280
@@ -279,7 +279,7 @@
  #endif
  DEF_ORA(01,NP,KA_INDX)	/* 01 - ORA - (Indirect,X) */
  DEF_ORA(05,ZP,KA_ZP)	/* 05 - ORA - Zero Page */
-@@ -751,7 +751,7 @@
+@@ -751,7 +751,7 @@ static void OpcodeCall Opcode7A(__CONTEX
  
  #if BUILD_HUC6280
  /* --- RMBi --- */
@@ -288,7 +288,7 @@
  { \
  	Uword adr = KA_ZP(__THISP); \
  	K_WRITEZP(__THISP_ adr, (Uword)(K_READZP(__THISP_ adr) & (~(1 << y)))); \
-@@ -765,7 +765,7 @@
+@@ -765,7 +765,7 @@ DEF_RMB(57,5)	/* 57 - RMB5 */
  DEF_RMB(67,6)	/* 67 - RMB6 */
  DEF_RMB(77,7)	/* 77 - RMB7 */
  /* --- SMBi --- */
@@ -297,7 +297,7 @@
  { \
  	Uword adr = KA_ZP(__THISP); \
  	K_WRITEZP(__THISP_ adr, (Uword)(K_READZP(__THISP_ adr) | (1 << y))); \
-@@ -781,10 +781,10 @@
+@@ -781,10 +781,10 @@ DEF_SMB(F7,7)	/* F7 - SMB7 */
  #endif
  
  /* --- ROL ---  */
@@ -310,7 +310,7 @@
  }
  DEF_ROL(26,ZP,KA_ZP)	/* 26 - ROL - Zero Page */
  DEF_ROL(2E,NP,KA_ABS)	/* 2E - ROL - Absolute */
-@@ -794,10 +794,10 @@
+@@ -794,10 +794,10 @@ static void OpcodeCall Opcode2A(__CONTEX
  { __THIS__.A = KM_ROL(__THISP_ __THIS__.A); }
  
  /* --- ROR ---  */
@@ -323,7 +323,7 @@
  }
  DEF_ROR(66,ZP,KA_ZP)	/* 66 - ROR - Zero Page */
  DEF_ROR(6E,NP,KA_ABS)	/* 6E - ROR - Absolute */
-@@ -841,10 +841,10 @@
+@@ -841,10 +841,10 @@ static void OpcodeCall Opcode02(__CONTEX
  #endif
  
  /* --- SBC ---  */
@@ -338,7 +338,7 @@
  DEF_SBC(E1,NP,KA_INDX)	/* E1 - SBC - (Indirect,X) */
  DEF_SBC(E5,ZP,KA_ZP)	/* E5 - SBC - Zero Page */
  DEF_SBC(E9,NP,KA_IMM)	/* E9 - SBC - Immediate */
-@@ -883,8 +883,8 @@
+@@ -883,8 +883,8 @@ static void OpcodeCall Opcode23(__CONTEX
  #endif
  
  /* --- STA --- */
@@ -349,7 +349,7 @@
  DEF_STA(81,NP,KA_INDX)	/* 81 - STA - (Indirect,X) */
  DEF_STA(85,ZP,KA_ZP)	/* 85 - STA - Zero Page */
  DEF_STA(8D,NP,KA_ABS)	/* 8D - STA - Absolute */
-@@ -897,23 +897,23 @@
+@@ -897,23 +897,23 @@ DEF_STA(92,NP,KA_IND)	/* 92 - STA - (Ind
  #endif
  
  /* --- STX ---  */
@@ -379,7 +379,7 @@
  DEF_STZ(64,ZP,KA_ZP)	/* 64 - STZ - Zero Page */
  DEF_STZ(9C,NP,KA_ABS)	/* 9C - STZ - Absolute */
  DEF_STZ(74,ZP,KA_ZPX)	/* 74 - STZ - Zero Page,X */
-@@ -931,18 +931,18 @@
+@@ -931,18 +931,18 @@ static void OpcodeCall Opcode43(__CONTEX
  
  #if BUILD_HUC6280 || BUILD_M65C02
  /* --- TRB --- */
@@ -402,7 +402,7 @@
  }
  DEF_TSB(04,ZP,KA_ZP)	/* 04 - TSB - Zero Page */
  DEF_TSB(0C,NP,KA_ABS)	/* 0C - TSB - Absolute */
-@@ -950,10 +950,10 @@
+@@ -950,10 +950,10 @@ DEF_TSB(0C,NP,KA_ABS)	/* 0C - TSB - Abso
  
  #if BUILD_HUC6280
  /* --- TST --- */
diff --git a/audio/xmms-nsf/files/patch-src__nes__km6502__km6502ot.h b/audio/xmms-nsf/files/patch-src_nes_km6502_km6502ot.h
index 2c4cfc1376cf..e0c40888f73b 100644
--- a/audio/xmms-nsf/files/patch-src__nes__km6502__km6502ot.h
+++ b/audio/xmms-nsf/files/patch-src_nes_km6502_km6502ot.h
@@ -1,5 +1,5 @@
---- ./src/nes/km6502/km6502ot.h.orig	Sun Jan  7 05:18:05 2001
-+++ ./src/nes/km6502/km6502ot.h	Wed Jan 10 20:10:34 2007
+--- src/nes/km6502/km6502ot.h.orig	2001-01-07 04:18:05 UTC
++++ src/nes/km6502/km6502ot.h
 @@ -1,35 +1,35 @@
  #define OPxx(i)
  #define OP__(i) \
diff --git a/audio/xmms-nsf/files/patch-src__xmms__callbacks.c b/audio/xmms-nsf/files/patch-src_xmms_callbacks.c
index b9f94ed7ac6c..b8999323c7f1 100644
--- a/audio/xmms-nsf/files/patch-src__xmms__callbacks.c
+++ b/audio/xmms-nsf/files/patch-src_xmms_callbacks.c
@@ -1,6 +1,6 @@
---- ./src/xmms/callbacks.c.orig	Sun Jul 23 12:06:43 2000
-+++ ./src/xmms/callbacks.c	Wed Jan 10 20:10:34 2007
-@@ -219,7 +219,7 @@
+--- src/xmms/callbacks.c.orig	2000-07-23 10:06:43 UTC
++++ src/xmms/callbacks.c
+@@ -219,7 +219,7 @@ nsf_on_ok_pressed                       
  	widget = lookup_widget(GTK_WIDGET(button), "spinbutton1");
  	nsf_cfg.play_time =  gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
  	widget = lookup_widget(GTK_WIDGET(button), "spinbutton2");
@@ -9,7 +9,7 @@
  	
  	filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL);
  	cfg = xmms_cfg_open_file(filename);
-@@ -228,7 +228,7 @@
+@@ -228,7 +228,7 @@ nsf_on_ok_pressed                       
  	}
  	
  	xmms_cfg_write_int(cfg, "NSF", "play_time",nsf_cfg.play_time);
diff --git a/audio/xmms-nsf/files/patch-src__xmms__interface.c b/audio/xmms-nsf/files/patch-src_xmms_interface.c
index 010a64d54b24..16c020d14e46 100644
--- a/audio/xmms-nsf/files/patch-src__xmms__interface.c
+++ b/audio/xmms-nsf/files/patch-src_xmms_interface.c
@@ -1,6 +1,6 @@
---- ./src/xmms/interface.c.orig	Sun Jul 23 11:41:14 2000
-+++ ./src/xmms/interface.c	Wed Jan 10 20:10:34 2007
-@@ -106,7 +106,7 @@
+--- src/xmms/interface.c.orig	2000-07-23 09:41:14 UTC
++++ src/xmms/interface.c
+@@ -106,7 +106,7 @@ create_configure (void)
    gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_LEFT);
    gtk_misc_set_alignment (GTK_MISC (label2), 0, 0.5);
  
diff --git a/audio/xmms-nsf/files/patch-src__xmms__nsf.c b/audio/xmms-nsf/files/patch-src_xmms_nsf.c
index 23a166e77a4f..df7f780b4776 100644
--- a/audio/xmms-nsf/files/patch-src__xmms__nsf.c
+++ b/audio/xmms-nsf/files/patch-src_xmms_nsf.c
@@ -1,5 +1,5 @@
---- ./src/xmms/nsf.c.orig	Sun Jan  7 06:15:12 2001
-+++ ./src/xmms/nsf.c	Wed Jan 10 20:13:26 2007
+--- src/xmms/nsf.c.orig	2001-01-07 05:15:12 UTC
++++ src/xmms/nsf.c
 @@ -23,7 +23,8 @@
  
  #define VERSION  "0.0.3"
@@ -10,7 +10,7 @@
  
  #include "nsf.h"
  
-@@ -328,7 +329,7 @@
+@@ -328,7 +329,7 @@ nsf_configure()
  		widget = lookup_widget(nsf_configure_win, "spinbutton1");
  		gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), nsf_cfg.play_time);
  		widget = lookup_widget(nsf_configure_win, "spinbutton2");
@@ -19,7 +19,7 @@
  
  		gtk_widget_show(nsf_configure_win);
  	}else{
-@@ -357,7 +358,7 @@
+@@ -357,7 +358,7 @@ nsf_init(void)
  	nsf_win->dock_window_list = NULL;
  	
  	nsf_cfg.play_time = PLAYTIME;	         /* second */
@@ -28,7 +28,7 @@
  	nsf_cfg.player_shaded = FALSE;
  	nsf_cfg.easy_move = FALSE;
  	
-@@ -365,7 +366,7 @@
+@@ -365,7 +366,7 @@ nsf_init(void)
  	
  	if ((cfg = xmms_cfg_open_file(filename)) != 0){
  		xmms_cfg_read_int(cfg, "NSF", "play_time", &nsf_cfg.play_time);
@@ -37,7 +37,7 @@
  		xmms_cfg_free(cfg);
  	}
  }
-@@ -439,10 +440,11 @@
+@@ -439,10 +440,11 @@ play_loop(void *arg)
  {
  	char data[2048 * 2];
  	int bytes, blk_size, rate;
@@ -50,7 +50,7 @@
  	NESReset();
  	
  	//16bit/8bit * 1channel * 512 sample = 1024byte
-@@ -460,7 +462,15 @@
+@@ -460,7 +462,15 @@ play_loop(void *arg)
  				}
  				if (bytes > 0){
  					//read 1024byte = 512 sample * 2byte
@@ -67,7 +67,7 @@
  					nsf_ip.add_vis_pcm(nsf_ip.output->written_time(), (nsf_file->bits_per_sample == 16) ? FMT_S16_LE : FMT_U8,
  							   nsf_file->channels, bytes, data);
  					
-@@ -512,11 +522,14 @@
+@@ -512,11 +522,14 @@ play_file(char *filename)
  	if (!(nsf_file->file = fopen(filename, "rb"))){
  		return;
  	}
diff --git a/audio/xmms-nsf/files/patch-src__xmms__nsf.h b/audio/xmms-nsf/files/patch-src_xmms_nsf.h
index e67712d5a676..a80511ebce7d 100644
--- a/audio/xmms-nsf/files/patch-src__xmms__nsf.h
+++ b/audio/xmms-nsf/files/patch-src_xmms_nsf.h
@@ -1,6 +1,6 @@
---- ./src/xmms/nsf.h.orig	Sun Jul 23 12:00:35 2000
-+++ ./src/xmms/nsf.h	Wed Jan 10 20:10:34 2007
-@@ -58,7 +58,7 @@
+--- src/xmms/nsf.h.orig	2000-07-23 10:00:35 UTC
++++ src/xmms/nsf.h
+@@ -58,7 +58,7 @@ NsfFile;
  typedef struct
  {
  	gint play_time;
diff --git a/audio/xmms-nsf/files/patch-src__xmms__nsflib.h b/audio/xmms-nsf/files/patch-src_xmms_nsflib.h
index 548c7eb55c1a..9f56581b0cd6 100644
--- a/audio/xmms-nsf/files/patch-src__xmms__nsflib.h
+++ b/audio/xmms-nsf/files/patch-src_xmms_nsflib.h
@@ -1,5 +1,5 @@
---- ./src/xmms/nsflib.h.orig	Sun Jul 23 12:05:21 2000
-+++ ./src/xmms/nsflib.h	Wed Jan 10 20:10:34 2007
+--- src/xmms/nsflib.h.orig	2000-07-23 10:05:21 UTC
++++ src/xmms/nsflib.h
 @@ -1,10 +1,11 @@
  typedef signed short Int16;
  typedef unsigned int Uint;