Changeset 2619 for trunk/texinfo/lib

Timestamp:

Mar 12, 2006, 6:02:46 PM (19 years ago)

Author:

bird

Message:

applied OS/2 patches (manually).

Location:

trunk/texinfo/lib

Files:

• Makefile.am (modified) (1 diff)
• system.h (modified) (4 diffs)

trunk/texinfo/lib/Makefile.am

@@ -18 +18 @@
                    gettext.h \
                    strcase.h strdup.h substring.c system.h \
-                   xalloc.h xexit.c xmalloc.c xstrdup.c
+                   xalloc.h xexit.c xmalloc.c xstrdup.c \
+                   pc.c pc.h
 libtxi_a_LIBADD = $(LIBOBJS) $(ALLOCA)
 libtxi_a_DEPENDENCIES = $(libtxi_a_LIBADD)

trunk/texinfo/lib/system.h

@@ -28 +28 @@
 #ifdef MIKTEX
 #include <gnu-miktex.h>
-#define S_ISDIR(x) ((x)&_S_IFDIR) 
+#define S_ISDIR(x) ((x)&_S_IFDIR)
 #else
 /* MiKTeX defines substring() in a separate DLL, where it has its
-   own __declspec declaration.  We don't want to try to duplicate 
+   own __declspec declaration.  We don't want to try to duplicate
    this Microsoft-ism here.  */
 extern char *substring (const char *, const char *);
@@ -213 +213 @@
 #  define DEFAULT_INFO_PRINT_COMMAND ">PRN"
 # else   /* O_BINARY && !__MSDOS__ */
-#  define setmode(f,m)  _setmode(f,m)
-#  define HAVE_LONG_FILENAMES(dir)   (1)
-#  define NULL_DEVICE   "NUL"
+#  ifdef __EMX__
+#   define NULL_DEVICE  "nul"
+#   define HAVE_LONG_FILENAMES(dir)   (1)
+#   define DEFAULT_INFO_PRINT_COMMAND "expand --tabs=4 >>InfoLog.tmp"
+#  else
+#   define setmode(f,m)  _setmode(f,m)
+#   define HAVE_LONG_FILENAMES(dir)   (1)
+#   define NULL_DEVICE  "NUL"
+#  endif /* !__EMX__ */
 # endif  /* O_BINARY && !__MSDOS__ */
 # ifdef __CYGWIN__
@@ -229 +235 @@
 # define FOPEN_RBIN     "rb"
 # define FOPEN_WBIN     "wb"
+# ifdef __EMX__                         /* bird - start */
+#  define FOPEN_RTXT     "rt"
+#  define FOPEN_WTXT     "wt"
+# else
+#  define FOPEN_RTXT     "r"
+#  define FOPEN_WTXT     "w"
+# endif                                 /* bird - end */
 # define HAVE_DRIVE(n)  ((n)[0] && (n)[1] == ':')
 # define IS_SLASH(c)    ((c) == '/' || (c) == '\\')
@@ -240 +253 @@
 # define FOPEN_RBIN     "r"
 # define FOPEN_WBIN     "w"
+# define FOPEN_RTXT     "r"             /* bird */
+# define FOPEN_WTXT     "w"             /* bird */
 # define IS_SLASH(c)    ((c) == '/')
 # define HAVE_DRIVE(n)  (0)