head	1.1;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.1
	OPENPKG_E1_MP:1.1
	OPENPKG_E1_MP_2_STABLE:1.1.2.2
	OPENPKG_E1_FP:1.1.2.2
	OPENPKG_2_STABLE_MP:1.1
	OPENPKG_2_STABLE_20061018:1.1.2.2
	OPENPKG_2_STABLE:1.1.0.2
	OPENPKG_CW_FP:1.1
	OPENPKG_1_STABLE_MP:1.1;
locks; strict;
comment	@# @;


1.1
date	2003.06.14.10.21.03;	author mlelstv;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2003.06.14.10.21.03;	author rse;	state dead;
branches;
next	1.1.2.2;
commitid	iZxwRSmmWscPXUQr;

1.1.2.2
date	2006.10.16.14.53.23;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.1
log
@quick and dirty patch to avoid treating stdout as a constant
@
text
@--- base/mclib.c.dist	2003-06-14 12:18:31.000000000 +0200
+++ base/mclib.c	2003-06-14 12:18:21.000000000 +0200
@@@@ -473,13 +473,12 @@@@
 }
 #line 1016 "mclib.nw"
 static void label_print(struct label *label) {
-  asmprintf(asmprintfd, "%s", label->name ? label->name : "???");
+  asmprintf(stdout, "%s", label->name ? label->name : "???");
 }
 #line 1022 "mclib.nw"
 typedef void (*asmprinter)(void *closure, const char *fmt, ...);
 extern int fprintf(FILE *stream, const char *fmt, ...); /* needed at Purdue -- ugh */
 void (*asmprintf)(void *closure, const char *fmt, ...) = (asmprinter) fprintf;
-void *asmprintfd = (void *)stdout;
 void (*asmprintreloc)(RAddr reloc) = reloc_print; /* calls asmprintf */
 #line 79 "reloc.nw"
 RAddr addr_new(label, offset) RLabel label; int offset; {
@@@@ -493,8 +492,8 @@@@
 #line 100 "reloc.nw"
 static void reloc_print(RAddr addr) {
   label_print(addr->label);
-  if (addr->offset > 0) asmprintf(asmprintfd, "+%d", addr->offset);
-  if (addr->offset < 0) asmprintf(asmprintfd,  "%d", addr->offset);
+  if (addr->offset > 0) asmprintf(stdout, "+%d", addr->offset);
+  if (addr->offset < 0) asmprintf(stdout,  "%d", addr->offset);
 }
 #line 113 "reloc.nw"
 RAddr unsigned_to_raddr(unsigned lc) {
@


1.1.2.1
log
@file njmc.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:53:23 +0000
@
text
@d1 28
@


1.1.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 28
--- base/mclib.c.dist	2003-06-14 12:18:31.000000000 +0200
+++ base/mclib.c	2003-06-14 12:18:21.000000000 +0200
@@@@ -473,13 +473,12 @@@@
 }
 #line 1016 "mclib.nw"
 static void label_print(struct label *label) {
-  asmprintf(asmprintfd, "%s", label->name ? label->name : "???");
+  asmprintf(stdout, "%s", label->name ? label->name : "???");
 }
 #line 1022 "mclib.nw"
 typedef void (*asmprinter)(void *closure, const char *fmt, ...);
 extern int fprintf(FILE *stream, const char *fmt, ...); /* needed at Purdue -- ugh */
 void (*asmprintf)(void *closure, const char *fmt, ...) = (asmprinter) fprintf;
-void *asmprintfd = (void *)stdout;
 void (*asmprintreloc)(RAddr reloc) = reloc_print; /* calls asmprintf */
 #line 79 "reloc.nw"
 RAddr addr_new(label, offset) RLabel label; int offset; {
@@@@ -493,8 +492,8 @@@@
 #line 100 "reloc.nw"
 static void reloc_print(RAddr addr) {
   label_print(addr->label);
-  if (addr->offset > 0) asmprintf(asmprintfd, "+%d", addr->offset);
-  if (addr->offset < 0) asmprintf(asmprintfd,  "%d", addr->offset);
+  if (addr->offset > 0) asmprintf(stdout, "+%d", addr->offset);
+  if (addr->offset < 0) asmprintf(stdout,  "%d", addr->offset);
 }
 #line 113 "reloc.nw"
 RAddr unsigned_to_raddr(unsigned lc) {
@