summaryrefslogtreecommitdiff
path: root/os2
diff options
context:
space:
mode:
authorAndy Dougherty <doughera@lafcol.lafayette.edu>1996-02-28 16:49:33 -0800
committerAndy Dougherty <doughera@lafcol.lafayette.edu>1996-02-28 16:49:33 -0800
commita5f75d667838e8e7bb037880391f5c44476d33b4 (patch)
tree5005e888355c1508bc47da697efe119c1615b123 /os2
parent2920c5d2b358b11ace52104b6944bfa0e89256a7 (diff)
downloadperl-a5f75d667838e8e7bb037880391f5c44476d33b4.tar.gz
perl 5.002perl-5.002
[editor's note: changes seem to be mostly module updates, documentation changes and some perl API macro additions]
Diffstat (limited to 'os2')
-rw-r--r--os2/diff.Makefile4
-rw-r--r--os2/diff.exec77
-rw-r--r--os2/os2ish.h2
3 files changed, 4 insertions, 79 deletions
diff --git a/os2/diff.Makefile b/os2/diff.Makefile
index 2d0b7238f1..fdce070977 100644
--- a/os2/diff.Makefile
+++ b/os2/diff.Makefile
@@ -124,7 +124,7 @@
! miniperl: $& miniperlmain.o $(perllib)
! $(CC) $(LARGE) $(CLDFLAGS) -o miniperl miniperlmain.o $(perllib) $(libs)
- @miniperl -w -MExporter -e 0 || $(MAKE) minitest
+ @./miniperl -w -Ilib -MExporter -e 0 || $(MAKE) minitest
! miniperlmain.o: miniperlmain.c
$(CCCMD) $(PLDLFLAGS) $*.c
@@ -143,7 +143,7 @@
! miniperl: $& miniperlmain$(OBJ_EXT) $(perllib)
! $(CC) $(LARGE) $(CLDFLAGS) -o miniperl miniperlmain$(OBJ_EXT) $(perllib) $(libs)
- @miniperl -w -MExporter -e 0 || $(MAKE) minitest
+ @./miniperl -w -Ilib -MExporter -e 0 || $(MAKE) minitest
! miniperlmain$(OBJ_EXT): miniperlmain.c
$(CCCMD) $(PLDLFLAGS) $*.c
diff --git a/os2/diff.exec b/os2/diff.exec
deleted file mode 100644
index f3ef938610..0000000000
--- a/os2/diff.exec
+++ /dev/null
@@ -1,77 +0,0 @@
-Only #if lines are changed below.
-
-diff -rc perl5.002b3/pp_sys.c perl5.002b3.new/pp_sys.c
-*** perl5.002b3/pp_sys.c Fri Feb 02 16:39:40 1996
---- perl5.002b3.new/pp_sys.c Sat Feb 03 21:20:56 1996
-***************
-*** 2771,2777 ****
- Signal_t (*ihand)(); /* place to save signal during system() */
- Signal_t (*qhand)(); /* place to save signal during system() */
-
-! #if defined(HAS_FORK) && !defined(VMS)
- if (SP - MARK == 1) {
- if (tainting) {
- char *junk = SvPV(TOPs, na);
---- 2771,2777 ----
- Signal_t (*ihand)(); /* place to save signal during system() */
- Signal_t (*qhand)(); /* place to save signal during system() */
-
-! #if defined(HAS_FORK) && !defined(VMS) && !defined(OS2)
- if (SP - MARK == 1) {
- if (tainting) {
- char *junk = SvPV(TOPs, na);
-***************
-*** 2817,2823 ****
- value = (I32)do_exec(SvPVx(sv_mortalcopy(*SP), na));
- }
- _exit(-1);
-! #else /* ! FORK or VMS */
- if (op->op_flags & OPf_STACKED) {
- SV *really = *++MARK;
- value = (I32)do_aspawn(really, MARK, SP);
---- 2817,2823 ----
- value = (I32)do_exec(SvPVx(sv_mortalcopy(*SP), na));
- }
- _exit(-1);
-! #else /* ! FORK or VMS or OS/2 */
- if (op->op_flags & OPf_STACKED) {
- SV *really = *++MARK;
- value = (I32)do_aspawn(really, MARK, SP);
-diff -rc perl5.002b3/util.c perl5.002b3.new/util.c
-*** perl5.002b3/util.c Fri Jan 26 15:46:42 1996
---- perl5.002b3.new/util.c Sat Feb 03 23:03:48 1996
-***************
-*** 1287,1293 ****
- VTOH(vtohl,long)
- #endif
-
-! #if !defined(DOSISH) && !defined(VMS) /* VMS' my_popen() is in VMS.c */
- FILE *
- my_popen(cmd,mode)
- char *cmd;
---- 1287,1294 ----
- VTOH(vtohl,long)
- #endif
-
-! #if !defined(DOSISH) && !defined(VMS) /* VMS' my_popen() is in
-! VMS.c, same with OS/2. */
- FILE *
- my_popen(cmd,mode)
- char *cmd;
-***************
-*** 1364,1370 ****
- return fdopen(p[this], mode);
- }
- #else
-! #if defined(atarist) || defined(OS2)
- FILE *popen();
- FILE *
- my_popen(cmd,mode)
---- 1365,1371 ----
- return fdopen(p[this], mode);
- }
- #else
-! #if defined(atarist)
- FILE *popen();
- FILE *
- my_popen(cmd,mode)
diff --git a/os2/os2ish.h b/os2/os2ish.h
index 8d0820dcfb..0a8720cf8d 100644
--- a/os2/os2ish.h
+++ b/os2/os2ish.h
@@ -70,6 +70,7 @@ void settmppath();
#define Stat(fname,bufptr) os2_stat((fname),(bufptr))
#define Fstat(fd,bufptr) fstat((fd),(bufptr))
+#define FFlush(fp) fflush(fp)
#undef S_IFBLK
#undef S_ISBLK
@@ -80,5 +81,6 @@ void settmppath();
#define Stat(fname,bufptr) stat((fname),(bufptr))
#define Fstat(fd,bufptr) fstat((fd),(bufptr))
+#define FFlush(fp) fflush(fp)
#endif