Changeset 2498 in kBuild for trunk/src

Timestamp:

Jul 22, 2011 12:05:57 PM (14 years ago)

Author:

bird

Message:

kash: OS/2 build fixes.

Location:

trunk/src/kash

Files:

• Makefile.kmk (modified) (1 diff)
• miscbltin.c (modified) (2 diffs)
• setmode.c (modified) (2 diffs)
• shfile.h (modified) (1 diff)
• shinstance.h (modified) (1 diff)
• shthread.c (modified) (1 diff)

trunk/src/kash/Makefile.kmk

@@ -129 +129 @@
 
 
-if1of ($(KBUILD_TARGET), win)
+if1of ($(KBUILD_TARGET), win os2)
 
 #

trunk/src/kash/miscbltin.c

@@ -63 +63 @@
 #undef rflag
 
-void *bsd_setmode(shinstance *psh, const char *p);
-mode_t bsd_getmode(const void *bbox, mode_t omode);
+void *kash_setmode(shinstance *psh, const char *p);
+mode_t kash_getmode(const void *bbox, mode_t omode);
 
 
@@ -271 +271 @@
 
                         INTOFF;
-                        if ((set = bsd_setmode(psh, ap)) != 0) {
-                                mask = bsd_getmode(set, ~mask & 0777);
+                        if ((set = kash_setmode(psh, ap)) != 0) {
+                                mask = kash_getmode(set, ~mask & 0777);
                                 ckfree(psh, set);
                         }

trunk/src/kash/setmode.c

@@ -94 +94 @@
  */
 mode_t
-bsd_getmode(const void *bbox, mode_t omode)
+kash_getmode(const void *bbox, mode_t omode)
 {
         const BITCMD *set;
@@ -182 +182 @@
 
 void *
-bsd_setmode(shinstance *psh, const char *p)
+kash_setmode(shinstance *psh, const char *p)
 {
         int perm, who;

trunk/src/kash/shfile.h

@@ -153 +153 @@
 int shfile_cloexec(shfdtab *, int, int);
 int shfile_ioctl(shfdtab *, int, unsigned long, void *);
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__OS2__)
 # define TIOCGWINSZ         0x4201
 typedef struct sh_winsize

trunk/src/kash/shinstance.h

@@ -33 +33 @@
 #ifndef _MSC_VER
 # include <termios.h>
+# include <sys/types.h>
 # include <sys/ioctl.h>
 # include <sys/resource.h>

trunk/src/kash/shthread.c

@@ -102 +102 @@
     psh = (shinstance *)TlsGetValue(sh_tls);
 #elif K_OS == K_OS_OS2
-    psh = (shinstance *)__libc_TLSGet(iTls)
+    psh = (shinstance *)__libc_TLSGet(sh_tls);
 #else
     psh = (shinstance *)pthread_getspecific(sh_tls);