diff options
author | SADA Kenji <sada@FreeBSD.org> | 2002-11-24 13:45:51 +0000 |
---|---|---|
committer | SADA Kenji <sada@FreeBSD.org> | 2002-11-24 13:45:51 +0000 |
commit | 2c2f68fad4363e537d6a0caef173a15fddc19de6 (patch) | |
tree | d6cbe6020764dd647a534320aae23d182ea43304 /editors/texmacs | |
parent | Add parallel to CATEGORIES. (diff) |
Unbreak for -current.
PR: ports/35549
Submitter: Michael J Estes <estesm@bw.2y.net>
Notes
Notes:
svn path=/head/; revision=71008
Diffstat (limited to 'editors/texmacs')
6 files changed, 146 insertions, 0 deletions
diff --git a/editors/texmacs/files/patch-src::Basic::Types::basic.gen.cc b/editors/texmacs/files/patch-src::Basic::Types::basic.gen.cc new file mode 100644 index 000000000000..b8a6ade3dd23 --- /dev/null +++ b/editors/texmacs/files/patch-src::Basic::Types::basic.gen.cc @@ -0,0 +1,75 @@ +--- src/Basic/Types/basic.gen.cc.orig Sun Nov 24 20:58:54 2002 ++++ src/Basic/Types/basic.gen.cc Sun Nov 24 20:59:24 2002 +@@ -26,72 +26,6 @@ + + extern int large_uses; + +-void* +-operator new (register size_t s) +-{ +- register void* ptr; +- s= (s+ WORD_LENGTH+ WORD_LENGTH_INC)&WORD_MASK; +- if (s<MAX_FAST) { +- ptr= alloc_ptr(s); +- if (ptr==NULL) ptr= enlarge_malloc (s); +- else alloc_ptr(s)= ind(ptr); +- } +- else { +- ptr= safe_malloc (s); +- large_uses += s; +- } +- *((size_t *) ptr)=s; +- return (void*) (((char*) ptr)+ WORD_LENGTH); +-} +- +-void +-operator delete (register void* ptr) +-{ +- ptr= (void*) (((char*) ptr)- WORD_LENGTH); +- register size_t s= *((size_t *) ptr); +- if (s<MAX_FAST) { +- ind(ptr) = alloc_ptr(s); +- alloc_ptr(s)= ptr; +- } +- else { +- free (ptr); +- large_uses -= s; +- } +-} +- +-void* +-operator new[] (register size_t s) +-{ +- register void* ptr; +- s= (s+ WORD_LENGTH+ WORD_LENGTH_INC)&WORD_MASK; +- if (s<MAX_FAST) { +- ptr= alloc_ptr(s); +- if (ptr==NULL) ptr= enlarge_malloc (s); +- else alloc_ptr(s)= ind(ptr); +- } +- else { +- ptr= safe_malloc (s); +- large_uses += s; +- } +- *((size_t *) ptr)=s; +- return (void*) (((char*) ptr)+ WORD_LENGTH); +-} +- +-void +-operator delete[] (register void* ptr) +-{ +- ptr= (void*) (((char*) ptr)- WORD_LENGTH); +- register size_t s= *((size_t *) ptr); +- if (s<MAX_FAST) { +- ind(ptr) = alloc_ptr(s); +- alloc_ptr(s)= ptr; +- } +- else { +- free (ptr); +- large_uses -= s; +- } +-} +- + bool + debug (int which, bool write_flag) { + static int debug_status= 0; diff --git a/editors/texmacs/files/patch-src::Basic::Types::basic.gen.h b/editors/texmacs/files/patch-src::Basic::Types::basic.gen.h new file mode 100644 index 000000000000..f7525322817c --- /dev/null +++ b/editors/texmacs/files/patch-src::Basic::Types::basic.gen.h @@ -0,0 +1,13 @@ +--- src/Basic/Types/basic.gen.h.orig Sun Nov 24 20:55:47 2002 ++++ src/Basic/Types/basic.gen.h Sun Nov 24 20:56:09 2002 +@@ -24,10 +24,6 @@ + typedef int SI; + typedef void* pointer; + +-void* operator new (register size_t s); +-void operator delete (register void* ptr); +-void* operator new[] (register size_t s); +-void operator delete[] (register void* ptr); + int mem_used (); + void mem_info (); + bool debug (int which, bool write_flag= FALSE); diff --git a/editors/texmacs/files/patch-src::Convert::Connect::pipes.gen.cc b/editors/texmacs/files/patch-src::Convert::Connect::pipes.gen.cc new file mode 100644 index 000000000000..6906c29419c1 --- /dev/null +++ b/editors/texmacs/files/patch-src::Convert::Connect::pipes.gen.cc @@ -0,0 +1,19 @@ +--- src/Convert/Connect/pipes.gen.cc.orig Sat Dec 15 23:51:53 2001 ++++ src/Convert/Connect/pipes.gen.cc Sun Nov 24 21:16:13 2002 +@@ -24,7 +24,6 @@ + #include <string.h> + #include <unistd.h> + #include <signal.h> +-#include <malloc.h> + #include <stdlib.h> + #include <sys/types.h> + #include <sys/wait.h> +@@ -340,7 +339,7 @@ + ******************************************************************************/ + + string +-connection_start (string name, string session, bool again=FALSE) { ++connection_start (string name, string session, bool again) { + // cout << "Start " << name << ", " << session << "\n"; + if (!connection_declared (name)) + return "Error: connection " * name * " has not been declared"; diff --git a/editors/texmacs/files/patch-src::Typeset::Boxes::Basic::rubber.gen.cc b/editors/texmacs/files/patch-src::Typeset::Boxes::Basic::rubber.gen.cc new file mode 100644 index 000000000000..0ae76389d13d --- /dev/null +++ b/editors/texmacs/files/patch-src::Typeset::Boxes::Basic::rubber.gen.cc @@ -0,0 +1,11 @@ +--- src/Typeset/Boxes/Basic/rubber.gen.cc.orig Sun Nov 24 21:02:01 2002 ++++ src/Typeset/Boxes/Basic/rubber.gen.cc Sun Nov 24 21:02:38 2002 +@@ -185,7 +185,7 @@ + /*****************************************************************************/ + + box +-empty_box (path ip, int x1=0, int y1=0, int x2=0, int y2=0) { ++empty_box (path ip, int x1, int y1, int x2, int y2) { + return new empty_box_rep (ip, x1, y1, x2, y2); + } + diff --git a/editors/texmacs/files/patch-src::Window::display.gen.h b/editors/texmacs/files/patch-src::Window::display.gen.h new file mode 100644 index 000000000000..da85bcc28994 --- /dev/null +++ b/editors/texmacs/files/patch-src::Window::display.gen.h @@ -0,0 +1,14 @@ +--- src/Window/display.gen.h.orig Sun Feb 10 20:37:01 2002 ++++ src/Window/display.gen.h Sun Nov 24 22:30:06 2002 +@@ -19,7 +19,10 @@ + + #ifndef _TIME_T + #define _TIME_T +-typedef long time_t; ++#ifndef _BSD_TIME_T_ ++#define _BSD_TIME_T_ int ++#endif ++typedef _BSD_TIME_T_ time_t; + #endif + + class font; diff --git a/editors/texmacs/files/patch-src::Window::event.gen.h b/editors/texmacs/files/patch-src::Window::event.gen.h new file mode 100644 index 000000000000..252a65b5da4f --- /dev/null +++ b/editors/texmacs/files/patch-src::Window::event.gen.h @@ -0,0 +1,14 @@ +--- src/Window/event.gen.h.orig Mon Dec 10 19:47:09 2001 ++++ src/Window/event.gen.h Sun Nov 24 22:30:56 2002 +@@ -19,7 +19,10 @@ + + #ifndef _TIME_T + #define _TIME_T +-typedef long time_t; ++#ifndef _BSD_TIME_T_ ++#define _BSD_TIME_T_ int ++#endif ++typedef _BSD_TIME_T_ time_t; + #endif + + class window_rep; |