openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File hugo-2.12.patch of Package hugo (Revision 253710f2195ed02ba36486302d818fc7)

Currently displaying revision 253710f2195ed02ba36486302d818fc7 , Show latest

--- cd.h
+++ cd.h
@@ -38,14 +38,14 @@
 void cdda_track_info(unsigned char *result, int track);
 // return info on the given track, result is 7-bytes long
 
-void cdda_read_sector(unsigned char* p,unsigned long nb_sect,
+void cdda_read_sector(unsigned char* p,unsigned int nb_sect,
                       unsigned char mode_read, unsigned char mode_addr);
 
-void cdda_cooked_prefech_read_sector_redbook(unsigned long nb_sect);
+void cdda_cooked_prefech_read_sector_redbook(unsigned int nb_sect);
 
-void cdda_cooked_prefech_read_sector_msf(unsigned long nb_sect);
+void cdda_cooked_prefech_read_sector_msf(unsigned int nb_sect);
 
-void cdda_dos_cooked_read_sector_lba(unsigned char* p, unsigned long nb_sect);
+void cdda_dos_cooked_read_sector_lba(unsigned char* p, unsigned int nb_sect);
 
 int	cdda_play_sectors(int begin_sect, int length);
 
--- configure
+++ configure
@@ -8592,7 +8592,7 @@
 fi
 
 	 ;;
-	 *i?86-?inux*)
+	 *-?inux*)
 	   echo "Linux build enabled"
 
 		 HUGO_TARGET_MACHINE="LINUX"
--- configure.ac
+++ configure.ac
@@ -583,7 +583,7 @@
 
 		 AM_CONDITIONAL(ALLEGRO_DJGPP, true)
 	 ;;
-	 *i?86-?inux*)
+	 *-?inux*)
 	   echo "Linux build enabled"
 
 		 HUGO_TARGET_MACHINE="LINUX"
--- crc_ctl.h
+++ crc_ctl.h
@@ -1,4 +1,4 @@
-unsigned long TAB_CONST[256] = {
+unsigned int TAB_CONST[256] = {
    0X0,
    0X77073096,
    0XEE0E612C,
--- defs.h
+++ defs.h
@@ -51,7 +51,7 @@
 
 typedef struct mode {
   Int16 size;
-  void (*func_format)(Char *, long, UChar *, Char *);
+  void (*func_format)(Char *, int, UChar *, Char *);
 } mode_struct;
 
 
--- format.c
+++ format.c
@@ -16,33 +16,33 @@
 /*@ -bufferoverflowhigh */
 
 void
-lineprint1 (char *outf, long ctr, unsigned char *op, char *outstring)
+lineprint1 (char *outf, int ctr, unsigned char *op, char *outstring)
 {
   sprintf (outf, "%02X          %s", *op, outstring);
 }
 
 void
-lineprint2 (char *outf, long ctr, unsigned char *op, char *outstring)
+lineprint2 (char *outf, int ctr, unsigned char *op, char *outstring)
 {
   sprintf (outf, "%02X %02X       %s", *op, *(op + 1), outstring);
 }
 
 void
-lineprint3 (char *outf, long ctr, unsigned char *op, char *outstring)
+lineprint3 (char *outf, int ctr, unsigned char *op, char *outstring)
 {
   sprintf (outf, "%02X %02X %02X    %s", *op, *(op + 1), *(op + 2),
 	   outstring);
 }
 
 void
-lineprint4 (char *outf, long ctr, unsigned char *op, char *outstring)
+lineprint4 (char *outf, int ctr, unsigned char *op, char *outstring)
 {
   sprintf (outf, "%02X %02X %02X %02X %s", *op, *(op + 1), *(op + 2),
 	   *(op + 3), outstring);
 }
 
 void
-lineprint7 (char *outf, long ctr, unsigned char *op, char *outstring)
+lineprint7 (char *outf, int ctr, unsigned char *op, char *outstring)
 {
   sprintf (outf, "%02X %02X %02X %02X %02X %02X %02X %s",
 	   *op, *(op + 1), *(op + 2), *(op + 3), *(op + 4),
@@ -54,7 +54,7 @@
 /* look/act as wrappers around lineprint functions */
 
 void
-implicit (char *outf, long ctr, unsigned char *op, char *str)
+implicit (char *outf, int ctr, unsigned char *op, char *str)
 {
   char buf[256];
   sprintf (buf, "%-4s", str);
@@ -62,7 +62,7 @@
 }
 
 void
-immed (char *outf, long ctr, unsigned char *op, char *str)
+immed (char *outf, int ctr, unsigned char *op, char *str)
 {
   char buf[256];
   sprintf (buf, "%-4s #$%02X", str, *(op + 1));
@@ -70,10 +70,10 @@
 }
 
 void
-relative (char *outf, long ctr, unsigned char *op, char *str)
+relative (char *outf, int ctr, unsigned char *op, char *str)
 {
   char buf[256];
-  long newadd;
+  int newadd;
   int offset = (int) *(op + 1);
 
 
@@ -82,12 +82,12 @@
 
   newadd = (ctr + 2) + offset;
 
-  sprintf (buf, "%-4s $%04lX", str, (unsigned long)newadd);
+  sprintf (buf, "%-4s $%04lX", str, (unsigned int)newadd);
   lineprint2 (outf, ctr, op, buf);
 }
 
 void
-ind_zp (char *outf, long ctr, unsigned char *op, char *str)
+ind_zp (char *outf, int ctr, unsigned char *op, char *str)
 {
   char buf[256];
   sprintf (buf, "%-4s $%02X", str, *(op + 1));
@@ -95,7 +95,7 @@
 }
 
 void
-ind_zpx (char *outf, long ctr, unsigned char *op, char *str)
+ind_zpx (char *outf, int ctr, unsigned char *op, char *str)
 {
   char buf[256];
   sprintf (buf, "%-4s $%02X,X", str, *(op + 1));
@@ -103,7 +103,7 @@
 }
 
 void
-ind_zpy (char *outf, long ctr, unsigned char *op, char *str)
+ind_zpy (char *outf, int ctr, unsigned char *op, char *str)
 {
   char buf[256];
   sprintf (buf, "%-4s $%02X,Y", str, *(op + 1));
@@ -111,7 +111,7 @@
 }
 
 void
-ind_zpind (char *outf, long ctr, unsigned char *op, char *str)
+ind_zpind (char *outf, int ctr, unsigned char *op, char *str)
 {
   char buf[256];
   sprintf (buf, "%-4s ($%02X)", str, *(op + 1));
@@ -119,7 +119,7 @@
 }
 
 void
-ind_zpix (char *outf, long ctr, unsigned char *op, char *str)
+ind_zpix (char *outf, int ctr, unsigned char *op, char *str)
 {
   char buf[256];
   sprintf (buf, "%-4s ($%02X,X)", str, *(op + 1));
@@ -127,7 +127,7 @@
 }
 
 void
-ind_zpiy (char *outf, long ctr, unsigned char *op, char *str)
+ind_zpiy (char *outf, int ctr, unsigned char *op, char *str)
 {
   char buf[256];
   sprintf (buf, "%-4s ($%02X),Y", str, *(op + 1));
@@ -135,7 +135,7 @@
 }
 
 void
-absol (char *outf, long ctr, unsigned char *op, char *str)
+absol (char *outf, int ctr, unsigned char *op, char *str)
 {
   char buf[256];
   sprintf (buf, "%-4s $%02X%02X", str, *(op + 2), *(op + 1));
@@ -143,7 +143,7 @@
 }
 
 void
-absind (char *outf, long ctr, unsigned char *op, char *str)
+absind (char *outf, int ctr, unsigned char *op, char *str)
 {
   char buf[256];
   sprintf (buf, "%-4s ($%02X%02X)", str, *(op + 2), *(op + 1));
@@ -151,7 +151,7 @@
 }
 
 void
-absindx (char *outf, long ctr, unsigned char *op, char *str)
+absindx (char *outf, int ctr, unsigned char *op, char *str)
 {
   char buf[256];
   sprintf (buf, "%-4s ($%02X%02X,X)", str, *(op + 2), *(op + 1));
@@ -159,7 +159,7 @@
 }
 
 void
-absx (char *outf, long ctr, unsigned char *op, char *str)
+absx (char *outf, int ctr, unsigned char *op, char *str)
 {
   char buf[256];
   sprintf (buf, "%-4s $%02X%02X,X", str, *(op + 2), *(op + 1));
@@ -167,7 +167,7 @@
 }
 
 void
-absy (char *outf, long ctr, unsigned char *op, char *str)
+absy (char *outf, int ctr, unsigned char *op, char *str)
 {
   char buf[256];
   sprintf (buf, "%-4s $%02X%02X,Y", str, *(op + 2), *(op + 1));
@@ -175,10 +175,10 @@
 }
 
 void
-pseudorel (char *outf, long ctr, unsigned char *op, char *str)
+pseudorel (char *outf, int ctr, unsigned char *op, char *str)
 {
   char buf[256];
-  long newadd;
+  int newadd;
   int offset = (int) *(op + 2);
 
   if (offset >= 128)
@@ -186,12 +186,12 @@
 
   newadd = (ctr + 3) + offset;
 
-  sprintf (buf, "%-4s $%02X, $%04lX", str, *(op + 1), (unsigned long)newadd);
+  sprintf (buf, "%-4s $%02X, $%04lX", str, *(op + 1), (unsigned int)newadd);
   lineprint3 (outf, ctr, op, buf);
 }
 
 void
-tst_zp (char *outf, long ctr, unsigned char *op, char *str)
+tst_zp (char *outf, int ctr, unsigned char *op, char *str)
 {
   char buf[256];
 
@@ -200,7 +200,7 @@
 }
 
 void
-tst_abs (char *outf, long ctr, unsigned char *op, char *str)
+tst_abs (char *outf, int ctr, unsigned char *op, char *str)
 {
   char buf[256];
 
@@ -210,7 +210,7 @@
 }
 
 void
-tst_zpx (char *outf, long ctr, unsigned char *op, char *str)
+tst_zpx (char *outf, int ctr, unsigned char *op, char *str)
 {
   char buf[256];
 
@@ -219,7 +219,7 @@
 }
 
 void
-tst_absx (char *outf, long ctr, unsigned char *op, char *str)
+tst_absx (char *outf, int ctr, unsigned char *op, char *str)
 {
   char buf[256];
 
@@ -229,7 +229,7 @@
 }
 
 void
-xfer (char *outf, long ctr, unsigned char *op, char *str)
+xfer (char *outf, int ctr, unsigned char *op, char *str)
 {
   char buf[256];
 
--- format.h
+++ format.h
@@ -6,25 +6,25 @@
 #ifndef FORMAT_H_
 
 #define FORMAT_H_
-extern void implicit (char *, long, unsigned char *, char *);
-extern void immed    (char *, long, unsigned char *, char *);
-extern void relative (char *, long, unsigned char *, char *);
-extern void ind_zp   (char *, long, unsigned char *, char *);
-extern void ind_zpx  (char *, long, unsigned char *, char *);
-extern void ind_zpy  (char *, long, unsigned char *, char *);
-extern void ind_zpind(char *, long, unsigned char *, char *);
-extern void ind_zpix (char *, long, unsigned char *, char *);
-extern void ind_zpiy (char *, long, unsigned char *, char *);
-extern void absol    (char *, long, unsigned char *, char *);
-extern void absx     (char *, long, unsigned char *, char *);
-extern void absy     (char *, long, unsigned char *, char *);
-extern void absind   (char *, long, unsigned char *, char *);
-extern void absindx  (char *, long, unsigned char *, char *);
-extern void pseudorel(char *, long, unsigned char *, char *);
-extern void tst_zp   (char *, long, unsigned char *, char *);
-extern void tst_abs  (char *, long, unsigned char *, char *);
-extern void tst_zpx  (char *, long, unsigned char *, char *);
-extern void tst_absx (char *, long, unsigned char *, char *);
-extern void xfer     (char *, long, unsigned char *, char *);
+extern void implicit (char *, int, unsigned char *, char *);
+extern void immed    (char *, int, unsigned char *, char *);
+extern void relative (char *, int, unsigned char *, char *);
+extern void ind_zp   (char *, int, unsigned char *, char *);
+extern void ind_zpx  (char *, int, unsigned char *, char *);
+extern void ind_zpy  (char *, int, unsigned char *, char *);
+extern void ind_zpind(char *, int, unsigned char *, char *);
+extern void ind_zpix (char *, int, unsigned char *, char *);
+extern void ind_zpiy (char *, int, unsigned char *, char *);
+extern void absol    (char *, int, unsigned char *, char *);
+extern void absx     (char *, int, unsigned char *, char *);
+extern void absy     (char *, int, unsigned char *, char *);
+extern void absind   (char *, int, unsigned char *, char *);
+extern void absindx  (char *, int, unsigned char *, char *);
+extern void pseudorel(char *, int, unsigned char *, char *);
+extern void tst_zp   (char *, int, unsigned char *, char *);
+extern void tst_abs  (char *, int, unsigned char *, char *);
+extern void tst_zpx  (char *, int, unsigned char *, char *);
+extern void tst_absx (char *, int, unsigned char *, char *);
+extern void xfer     (char *, int, unsigned char *, char *);
 
 #endif
--- hcd.c
+++ hcd.c
@@ -28,6 +28,8 @@
 
 UChar HCD_current_played_track = 0;
 
+extern char* get_config_string (char *section, char *keyword, char *default_value);
+
 int
 fill_HCD_info (char *name)
 {
--- list_rom.c
+++ list_rom.c
@@ -9672,10 +9672,10 @@
 
 #endif
 
-unsigned long
+unsigned int
 filesize (FILE * F)
 {
-  unsigned long old_pos, end;
+  unsigned int old_pos, end;
   fgetpos (F, (fpos_t *) &old_pos);
   fseek (F, 0, SEEK_END);
   fgetpos (F, (fpos_t *) &end);
--- list_rom.h
+++ list_rom.h
@@ -32,7 +32,7 @@
 
 struct pce_rom_info
 {
-  unsigned long CRC;
+  unsigned int CRC;
   char *name, *producer, *date, *note;
   unsigned short flags;
 };
@@ -46,7 +46,7 @@
 
 // extern ROM_TYPE ROM_LIST[NB_ROM];
 
-unsigned long filesize(FILE *F);
+unsigned int filesize(FILE *F);
 UInt32 CRC_file(char *name);
 void pce_build_romlist(void);
 
--- lsmp3.c
+++ lsmp3.c
@@ -65,7 +65,7 @@
 #endif
 
 /* Needs to be at least 4 bytes */
-typedef unsigned long uint4;
+typedef unsigned int uint4;
 
 /*
  *   1st index:  0 = "MPEG 1.0",   1 = "MPEG 2.0"
@@ -111,7 +111,7 @@
 {
   FILE *fp;
   char *pFileSpec;
-  long FilePos;
+  int FilePos;
   char TagStr[TAG_LEN + 1];
   char SongNameStr[SONGNAME_LEN + 1];
   char ArtistStr[ARTIST_LEN + 1];
@@ -135,11 +135,11 @@
   int fCopyright = 0;
   int fOriginal = 0;
   uint4 Head;
-  long n;
-/*   long Length; */
-  long TotTime = 0;
-  long TotLength = 0;
-  long TotNum = 0;
+  int n;
+/*   int Length; */
+  int TotTime = 0;
+  int TotLength = 0;
+  int TotNum = 0;
   int i;
 
   /* Add a few extra bytes so we may overstep our buffer */
@@ -245,7 +245,7 @@
     fseek (fp, 0, SEEK_END);
     FilePos = ftell (fp);
 
-    return (float) FilePos / ((long) KbPerSec * 125);
+    return (float) FilePos / ((int) KbPerSec * 125);
 
 /*
       TotTime += Length;
--- miniunz.c
+++ miniunz.c
@@ -149,7 +149,7 @@
   if (buf == NULL)
     {
       Log ("Error allocating memory\n");
-      return UNZ_INTERNALERROR;
+      return (void*)UNZ_INTERNALERROR;
     }
 
   p = filename_withoutpath = filename_inzip;
--- miniunz.h
+++ miniunz.h
@@ -20,7 +20,7 @@
 char *find_possible_filename_in_zip (char *zipfilename);
 
 //! Extract file content from zip archive
-int extract_file_in_memory (char *zipfilename, char *archivedfile,
+char* extract_file_in_memory (char *zipfilename, char *archivedfile,
 			    size_t * unzipped_size);
 
 #endif
--- mix.c
+++ mix.c
@@ -246,7 +246,7 @@
       AWriteAudioData (lpWave, 0L, lpWave->dwLength);
 
       {
-	long dum;
+	int dum;
 	do
 	  {
 	    AGetVoicePosition (hVoice, &dum);
@@ -272,7 +272,7 @@
       AWriteAudioData (lpWave, 0L, lpWave->dwLength);
 
       {
-	long dum;
+	int dum;
 	do
 	  {
 	    AGetVoicePosition (hVoice, &dum);
@@ -303,7 +303,7 @@
 
 #else /* not double buffer */
   {
-    long dum;
+    int dum;
     do
       {
 	AGetVoicePosition (hVoice, &dum);
--- optable.h
+++ optable.h
@@ -33,7 +33,7 @@
 
 typedef struct mode_debug {
   unsigned char size;
-  void (*func)(char *, long int, unsigned char *, char *);
+  void (*func)(char *, int, unsigned char *, char *);
 } mode_struct_debug;
 
 /* now define table contents: */
--- osd_linux_allegro_gfx.c
+++ osd_linux_allegro_gfx.c
@@ -114,8 +114,8 @@
     {
       // Eagle-blit piccy to the screen
       _eagle (
-             (unsigned long*)(XBuf->line[dum]+screen_blit_x - 8)                  // First line of piccy  (320 pixels)
-            ,(unsigned long*)(XBuf->line[dum+1]+screen_blit_x - 8)              // 2nd line of piccy (320 pixels)
+             (unsigned int*)(XBuf->line[dum]+screen_blit_x - 8)                  // First line of piccy  (320 pixels)
+            ,(unsigned int*)(XBuf->line[dum+1]+screen_blit_x - 8)              // 2nd line of piccy (320 pixels)
             ,io.screen_w
             ,EAGLE_buf->seg
             ,(int)EAGLE_buf->line[dum<<1] //  + ( ( (x   <<1) * piccy->w ) << 1)           // First eagled line = 320x2 = 640 pixels
--- pce.c
+++ pce.c
@@ -639,7 +639,7 @@
 read_sector_BIN (unsigned char *p, UInt32 sector)
 {
   static int first_read = 1;
-  static long second_track_sector = 0;
+  static int second_track_sector = 0;
   int result;
 
 
@@ -647,7 +647,7 @@
     {
       UChar found = 0, dummy;
       int index_in_header = 0;
-      unsigned long position;
+      unsigned int position;
 
       fseek (iso_FILE, 0, SEEK_SET);
 
@@ -2684,7 +2684,7 @@
 InitPCE (char *name, char *backmemname)
 {
   int i = 0, ROMmask;
-  unsigned long CRC;
+  unsigned int CRC;
   int dummy;
   char *tmp_dummy;
   char local_us_encoded_card = 0;
--- pce.h
+++ pce.h
@@ -196,7 +196,7 @@
 extern UChar language;
 // the current language
 
-extern int BaseClock, UPeriod;
+extern int UPeriod;
 
 extern UChar US_encoded_card;
 // Do we have to swap even and odd bytes in the rom
--- sprite.c
+++ sprite.c
@@ -85,7 +85,7 @@
 static void
 plane2pixel (int no)
 {
-  unsigned long M;
+  unsigned int M;
   UChar *C = VRAM + no * 32;
   UInt32 L;
   UChar *C2 = VRAM2 + no * 8 * 4;
@@ -158,7 +158,7 @@
   // 2 longs -> 16 nibbles => 32 loops for a 16*16 spr
   for (i = 0; i < 32; i++, C++, C2 += 4)
     {
-      long L;
+      int L;
       M = C[0];
       L =
 	((M & 0x88) >> 3) | ((M & 0x44) << 6) | ((M & 0x22) << 15) |
@@ -278,7 +278,7 @@
 	      for (i = 0; i < h; i++, P += WIDTH, C2 += 4, C += 2)
 #endif
 		{
-		  unsigned long L;
+		  unsigned int L;
 		  UChar J;
 		  J = (C[0] | C[1] | C[16] | C[17]);
 		  if (!J)
@@ -394,11 +394,11 @@
 }
 
 void
-PutSpriteHandleFull (UChar * P, UChar * C, unsigned long *C2, UChar * R,
+PutSpriteHandleFull (UChar * P, UChar * C, unsigned int *C2, UChar * R,
 		     int h, int inc)
 {
   int i, J;
-  unsigned long L;
+  unsigned int L;
 #if defined(NEW_GFX_ENGINE)
   for (i = 0; i < h; i++, C += inc, C2 += inc, P += XBUF_WIDTH)
 #else
@@ -482,11 +482,11 @@
 
 
 static void
-PutSpriteHflip (UChar * P, UChar * C, unsigned long *C2, UChar * R, int h,
+PutSpriteHflip (UChar * P, UChar * C, unsigned int *C2, UChar * R, int h,
 		int inc)
 {
   int i, J;
-  unsigned long L;
+  unsigned int L;
 #if defined(NEW_GFX_ENGINE)
   for (i = 0; i < h; i++, C += inc, C2 += inc, P += XBUF_WIDTH)
 #else
@@ -564,7 +564,7 @@
 	    UChar * M, UChar pr)
 {
   int i, J;
-  unsigned long L;
+  unsigned int L;
 #if defined(NEW_GFX_ENGINE)
   for (i = 0; i < h;
        i++, C += inc, C2 += inc * 4, P += XBUF_WIDTH, M += XBUF_WIDTH)
@@ -629,7 +629,7 @@
 		 int inc, UChar * M, UChar pr)
 {
   int i, J;
-  unsigned long L;
+  unsigned int L;
 #if defined(NEW_GFX_ENGINE)
   for (i = 0; i < h;
        i++, C += inc, C2 += inc * 4, P += XBUF_WIDTH, M += XBUF_WIDTH)
@@ -693,7 +693,7 @@
 {
   int i;
   UInt16 J;
-  unsigned long L;
+  unsigned int L;
 #if defined(NEW_GFX_ENGINE)
   for (i = 0; i < h;
        i++, C += inc, C2 += inc * 4, P += XBUF_WIDTH, M += XBUF_WIDTH)
@@ -818,7 +818,7 @@
 			int h, int inc, UChar * M, UChar pr)
 {
   int i, J;
-  unsigned long L;
+  unsigned int L;
 #if defined(NEW_GFX_ENGINE)
   for (i = 0; i < h;
        i++, C += inc, C2 += inc * 4, P += XBUF_WIDTH, M += XBUF_WIDTH)
--- subs_eagle.c
+++ subs_eagle.c
@@ -1,6 +1,6 @@
 void eagle
-    ( 	unsigned long *lb,
-		unsigned long *lb2,
+    ( 	unsigned int *lb,
+		unsigned int *lb2,
 		short width,
 		int destination_segment,
 		int screen_address1,
@@ -9,8 +9,8 @@
        }
 
 void _eagle
-    ( 	unsigned long *lb,
-		unsigned long *lb2,
+    ( 	unsigned int *lb,
+		unsigned int *lb2,
 		short width,
 		int destination_segment,
 		int screen_address1,
--- utils.c
+++ utils.c
@@ -197,7 +197,7 @@
 
 #endif /* WIN32 */
 
-unsigned long TAB_CONST[256] = {
+unsigned int TAB_CONST[256] = {
    0X0,
    0X77073096,
    0XEE0E612C,
--- utils.h
+++ utils.h
@@ -24,7 +24,7 @@
 void wait_next_vsync();
 
 //! CRC predefined array
-extern unsigned long TAB_CONST[256];
+extern unsigned int TAB_CONST[256];
 
 #if defined(WIN32)
 
--- view_inf.c
+++ view_inf.c
@@ -446,7 +446,7 @@
   unsigned char *R = &SPal[(((SPR *) SPRAM)[0].atr & 15) * 16];
   unsigned char *C;
   char *tmp_buf = (char *) alloca (100);
-  unsigned long *C2;
+  unsigned int *C2;
 /*
  clear(screen);

Places

File hugo-2.12.patch of Package hugo (Revision 253710f2195ed02ba36486302d818fc7)

Places