diff options
| author | Alexander Langer <alex@FreeBSD.org> | 2002-09-24 11:04:09 +0000 |
|---|---|---|
| committer | Alexander Langer <alex@FreeBSD.org> | 2002-09-24 11:04:09 +0000 |
| commit | f4f721ab4e39189c4addb0a0db62031fe8134842 (patch) | |
| tree | de2f6fccbba4f545e49c35983f7170a01cac2547 /x11-clocks | |
| parent | f6100b02b8fb25dcfe818d2cb515bdb0672ec301 (diff) | |
| download | ports-f4f721ab4e39189c4addb0a0db62031fe8134842.tar.gz ports-f4f721ab4e39189c4addb0a0db62031fe8134842.zip | |
Don't declare malloc(), as it is already in stdio.h
Notes
Notes:
svn path=/head/; revision=67090
Diffstat (limited to 'x11-clocks')
| -rw-r--r-- | x11-clocks/tclock/files/patch-aa | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/x11-clocks/tclock/files/patch-aa b/x11-clocks/tclock/files/patch-aa index c46bede26e3c..320dae14c9b5 100644 --- a/x11-clocks/tclock/files/patch-aa +++ b/x11-clocks/tclock/files/patch-aa @@ -1,5 +1,5 @@ ---- tclock.c.orig Mon Dec 21 11:56:29 1992 -+++ tclock.c Fri May 19 00:49:55 2000 +--- tclock.c.orig Mon Dec 21 20:56:29 1992 ++++ tclock.c Tue Sep 24 13:02:59 2002 @@ -22,7 +22,10 @@ */ @@ -29,7 +29,16 @@ /* This call to XPending ensures that if the window gets closed, we die */ XPending(display); -@@ -233,11 +236,11 @@ +@@ -222,8 +225,6 @@ + strToTP(s) + char *s; + { +- extern +- char *malloc(); + + XTextProperty *tp = (XTextProperty *)malloc(sizeof *tp); + XStringListToTextProperty(&s, 1, tp); +@@ -233,11 +234,11 @@ int sigalrm() { @@ -44,7 +53,7 @@ } unsigned long -@@ -309,6 +312,7 @@ +@@ -309,6 +310,7 @@ extern char *getenv(); char *displayName, fn[1000]; @@ -52,7 +61,7 @@ int parseReturn, rc; XrmParseCommand(&db, option, numOptions, "tclock", &ac, av); -@@ -330,7 +334,7 @@ +@@ -330,7 +332,7 @@ display = XOpenDisplay(displayName); if(display == 0) { @@ -61,7 +70,7 @@ exit(-1); } -@@ -341,13 +345,14 @@ +@@ -341,13 +343,14 @@ exit(1); db = XrmGetStringDatabase(tclockDefaults); @@ -78,7 +87,7 @@ XrmMergeDatabases(XrmGetFileDatabase(getenv("XENVIRONMENT")), &db); XrmMergeDatabases(cmdDB, &db); -@@ -410,7 +415,7 @@ +@@ -410,7 +413,7 @@ XMapRaised(display, mainWindow); XFlush(display); @@ -87,7 +96,7 @@ new.it_interval.tv_sec = 1; new.it_value.tv_sec = 1; new.it_interval.tv_usec = 0; -@@ -420,4 +425,3 @@ +@@ -420,4 +423,3 @@ for(;;) sigpause(0); } |