[patch] Fix things.

chipmunk-64bit-and-libc-features.patch (text/plain), 5.22 KB, created by Ewgenij Starostin on 2010-10-25 19:15:53 UTC

diff -Naurp chipmunk-dist-old/log/src/log.c chipmunk-dist/log/src/log.c
--- chipmunk-dist-old/log/src/log.c	2010-10-25 15:36:07.000000000 +0200
+++ chipmunk-dist/log/src/log.c	2010-10-25 20:53:34.000000000 +0200
@@ -153,6 +153,9 @@ extern char *GetChipmunkPath();
 char *my_strdup();
 #undef strdup
 #define strdup my_strdup
+/* Support copy between overlapping regions: */
+#undef strcpy
+#define strcpy(dest,src) ((char*)memmove((dest),(src),strlen(src)+1))
 #define newci_findprocedure2  findprocedure
 extern boolean findprocedure PP((Char *name, Void (**start)()));
 
@@ -273,7 +276,7 @@ extern boolean findprocedure PP((Char *n
 
 
 typedef struct descrec {
-#ifdef __alpha__
+#if defined(__alpha__) || defined(__LP64__)
   int ptr;
 #else
   long ptr;
@@ -292,7 +295,7 @@ typedef union filerec {
   schar sb[256];
   Char c[256];
   short sh[128];
-#ifdef __alpha__
+#if defined(__alpha__) || defined(__LP64__)
   int i[64];
 #else
   long i[64];
@@ -5466,7 +5469,7 @@ Static Void pass()
 /* p2c: log.text, line 5010:
  * Note: Suspicious mixture of sizes in NA_NEW [173] */
 
-#ifdef __alpha__
+#if defined(__alpha__) || defined(__LP64__)
           ht = (log_htrec *)Malloc(sizeof(log_htrec) -
                                   log_million * sizeof(Anyptr) +
                                   hncount * sizeof(Anyptr) *2);
@@ -20190,7 +20193,7 @@ Char *name;
   }
 /* p2c: log.text, line 18951:
  * Note: Suspicious mixture of sizes in NA_NEW [173] */
-  mp3 = (macrorec *)Malloc(strlen(name) + 9L);
+  mp3 = (macrorec *)Malloc(sizeof(macrorec) - 32 + strlen(name));
   if (mp != NULL && mp->key == key) {
     mp3->next = mp->next;
     Free(mp);
diff -Naurp chipmunk-dist-old/log/src/loged.c chipmunk-dist/log/src/loged.c
--- chipmunk-dist-old/log/src/loged.c	2010-10-25 15:36:07.000000000 +0200
+++ chipmunk-dist/log/src/loged.c	2010-10-25 20:54:40.000000000 +0200
@@ -192,7 +192,7 @@ typedef union filerec {
   schar sb[256];
   uchar c[256];
   short sh[128];
-#ifdef __alpha__
+#if defined(__alpha__) || defined(__LP64__)
   int i[64];
 #else
   long i[64];
@@ -218,7 +218,7 @@ typedef struct oldrec {
   _REC_pin pin[32];
   short numvects;
   ovectorrec vector[64];
-#ifdef __alpha__
+#if defined(__alpha__) || defined(__LP64__)
   int next;
 #else
   long next;
diff -Naurp chipmunk-dist-old/log/src/loged.safe.c chipmunk-dist/log/src/loged.safe.c
--- chipmunk-dist-old/log/src/loged.safe.c	2010-10-25 15:36:07.000000000 +0200
+++ chipmunk-dist/log/src/loged.safe.c	2010-10-25 20:54:26.000000000 +0200
@@ -192,7 +192,7 @@ typedef union filerec {
   schar sb[256];
   uchar c[256];
   short sh[128];
-#ifdef __alpha__
+#if defined(__alpha__) || defined(__LP64__)
   int i[64];
 #else
   long i[64];
@@ -218,7 +218,7 @@ typedef struct oldrec {
   _REC_pin pin[32];
   short numvects;
   ovectorrec vector[64];
-#ifdef __alpha__
+#if defined(__alpha__) || defined(__LP64__)
   int next;
 #else
   long next;
diff -Naurp chipmunk-dist-old/psys/include/p2c/p2c.h chipmunk-dist/psys/include/p2c/p2c.h
--- chipmunk-dist-old/psys/include/p2c/p2c.h	2010-10-25 15:36:08.000000000 +0200
+++ chipmunk-dist/psys/include/p2c/p2c.h	2010-10-25 20:54:57.000000000 +0200
@@ -384,7 +384,7 @@ typedef struct {
 
 /* Memory allocation */
 #ifdef __GCC__
-#ifdef __alpha__
+#if defined(__alpha__) || defined(__LP64__)
 # define Malloc(n)  (malloc((n) ? (n) : 1) ?: (Anyptr)(long)_OutMem())
 #else
 # define Malloc(n)  (malloc((n) ? (n) : 1) ?: (Anyptr)_OutMem())
diff -Naurp chipmunk-dist-old/until/V1.2/ffman.c chipmunk-dist/until/V1.2/ffman.c
--- chipmunk-dist-old/until/V1.2/ffman.c	2010-10-25 15:36:06.000000000 +0200
+++ chipmunk-dist/until/V1.2/ffman.c	2010-10-25 15:36:53.000000000 +0200
@@ -136,7 +136,7 @@ Static void read_error(Char *s)
 }
 
 
-Static boolean getline(void)
+Static boolean getline_comments(void)
 {
   Char *TEMP;
 
@@ -181,13 +181,13 @@ Static boolean getInterestingLine(void)
   if (cpos <= strlen(buffer))
     return true;
 
-  if (!getline())
+  if (!getline_comments())
     return false;
 
   q = true;
   skip_blanks();
   while (cpos > strlen(buffer) && q) {
-    q = getline();
+    q = getline_comments();
     skip_blanks();
   }
   return (q == true);
@@ -1512,7 +1512,7 @@ fileSpec *read_in_a_file(Char *s_)
   strcpy(s, s_);
   if (start_Read_operation(s)) {
     fs = make_filespec(s, established);
-    while (getline())   /*still more stuff out there*/
+    while (getline_comments())   /*still more stuff out there*/
       f = read_figure();
     Result = fs;
     if (ff_file != NULL)
diff -Naurp chipmunk-dist-old/view/viewmod.c chipmunk-dist/view/viewmod.c
--- chipmunk-dist-old/view/viewmod.c	2010-10-25 15:36:08.000000000 +0200
+++ chipmunk-dist/view/viewmod.c	2010-10-25 15:36:53.000000000 +0200
@@ -60,6 +60,8 @@ the Free Software Foundation, Inc., 675
 /* Last edit by dave on Nov 11, 1987 3:14 am */
 /* Last edit by dave on Nov 9, 1987 11:49 pm */
 
+#define _GNU_SOURCE
+#include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff -Naurp chipmunk-dist-old/wol/wol_init.c chipmunk-dist/wol/wol_init.c
--- chipmunk-dist-old/wol/wol_init.c	2010-10-25 15:36:10.000000000 +0200
+++ chipmunk-dist/wol/wol_init.c	2010-10-25 15:36:53.000000000 +0200
@@ -33,6 +33,8 @@ the Free Software Foundation, Inc., 675
 
 
 
+#define _GNU_SOURCE
+#include <stdio.h>
 #include "global.h"