Changeset 21916 for trunk/include/os2wrap2.h

Timestamp:

Dec 18, 2011, 10:28:22 PM (14 years ago)

Author:

dmik

Message:

Merge branch gcc-kmk to trunk.

Location:

trunk

Files:

• . (modified) (2 props)
• include/os2wrap2.h (modified) (2 diffs)

trunk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

trunk/include/os2wrap2.h

@@ -791 +791 @@
 #define os2_CCHMAXPATH 260
 #define os2_CCHMAXPATHCOMP 256
+#define os2_FILE_BEGIN 0
+#define os2_FILE_CURRENT 1
+#define os2_FILE_END 2
+#define os2_FILE_SECTOR 0x8000
+#define os2_FILE_NORMAL 0x0000
+#define os2_FILE_READONLY 0x0001
+#define os2_FILE_HIDDEN 0x0002
+#define os2_FILE_SYSTEM 0x0004
+#define os2_FILE_DIRECTORY 0x0010
+#define os2_FILE_ARCHIVED 0x0020
+#define os2_FILE_IGNORE 0x10000
+#define os2_FILE_EXISTED 0x0001
+#define os2_FILE_CREATED 0x0002
+#define os2_FILE_TRUNCATED 0x0003
+#define os2_FILE_OPEN 0x0001
+#define os2_FILE_TRUNCATE 0x0002
+#define os2_FILE_CREATE 0x0010
+#define os2_MUST_HAVE_READONLY (os2_FILE_READONLY       | (os2_FILE_READONLY  << 8))
+#define os2_MUST_HAVE_HIDDEN (os2_FILE_HIDDEN   | (os2_FILE_HIDDEN        << 8))
+#define os2_MUST_HAVE_SYSTEM (os2_FILE_SYSTEM   | (os2_FILE_SYSTEM        << 8))
+#define os2_MUST_HAVE_DIRECTORY (os2_FILE_DIRECTORY | (os2_FILE_DIRECTORY << 8))
+#define os2_MUST_HAVE_ARCHIVED (os2_FILE_ARCHIVED       | (os2_FILE_ARCHIVED  << 8))
 #define HFILE os2_HFILE
 #define PHFILE os2_PHFILE
@@ -3358 +3380 @@
 #undef CCHMAXPATH
 #undef CCHMAXPATHCOMP
+#undef FILE_BEGIN
+#undef FILE_CURRENT
+#undef FILE_END
+#undef FILE_SECTOR
+#undef FILE_NORMAL
+#undef FILE_READONLY
+#undef FILE_HIDDEN
+#undef FILE_SYSTEM
+#undef FILE_DIRECTORY
+#undef FILE_ARCHIVED
+#undef FILE_IGNORE
+#undef FILE_EXISTED
+#undef FILE_CREATED
+#undef FILE_TRUNCATED
+#undef FILE_OPEN
+#undef FILE_TRUNCATE
+#undef FILE_CREATE
+#undef MUST_HAVE_READONLY
+#undef MUST_HAVE_HIDDEN
+#undef MUST_HAVE_SYSTEM
+#undef MUST_HAVE_DIRECTORY
+#undef MUST_HAVE_ARCHIVED
 #undef HFILE
 #undef PHFILE

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk