Changeset 352

Timestamp:

Sep 19, 2011, 10:58:18 PM (14 years ago)

Author:

Yuri Dario

Message:

git: restored t.ebisawa header.

File:

• git/trunk/compat/os2-git-compat.h (modified) (3 diffs)

git/trunk/compat/os2-git-compat.h ¶

@@ -28 +28 @@
 #define POLLHUP 2
 
-#define SHUT_WR 2
+#define SHUT_RD         0               /* shut down the reading side */
+#define SHUT_WR         1               /* shut down the writing side */
+#define SHUT_RDWR       2               /* shut down both sides */
 
-//extern int poll (struct pollfd *, nfds_t, int);
+extern int poll (struct pollfd *, nfds_t, int);
 
 extern int wrapped_execl_for_os2 (const char *, char *, ...);
@@ -39 +41 @@
 #ifndef BUILDING_COMPAT_OS2
 # ifdef __EMX__
-//#  define chdir(d) _chdir2(d)
-//#  define getcwd(d,n) _getcwd2(d,n)
+#  define chdir(d) _chdir2(d)
+#  define getcwd(d,n) _getcwd2(d,n)
 # endif
 # define getenv(e) wrapped_getenv_for_os2 (e)
 # define getpwuid(u) wrapped_getpwuid_for_klibc (u)
-//# define unlink(f) wrapped_unlink_for_dosish_system (f)
-//# define execl wrapped_execl_for_os2
-//# define execlp wrapped_execlp_for_os2
-//# define execv wrapped_execv_for_os2
-//# define execvp wrapped_execvp_for_os2
+# define unlink(f) wrapped_unlink_for_dosish_system (f)
+# define execl wrapped_execl_for_os2
+# define execlp wrapped_execlp_for_os2
+# define execv wrapped_execv_for_os2
+# define execvp wrapped_execvp_for_os2
 #endif
 
 
-#ifndef _SOCKLEN_T_DECLARED
+//#ifndef _SOCKLEN_T_DECLARED
 //typedef int socklen_t;
-# define _SOCKLEN_T_DECLARED
-#endif
+//# define _SOCKLEN_T_DECLARED
+//#endif
 
 #define has_dos_drive_prefix(path) (isalpha(*(path)) && (path)[1] == ':')
@@ -69 +71 @@
 { \
   git_os2_main_prepare(&argc,&argv); \
-  return git_os2_main(argc, argv); \
+  return git_os2_main(argc, (const char **)argv); \
 } \
 int git_os2_main(c,v)