Changeset 3948 for trunk

Timestamp:

Nov 9, 2018, 11:39:49 PM (7 years ago)

Author:

bird

Message:

os2emx.h: Fixed FDATE and FTIME for watcom, dropped the pragma pack(1) around GINFOSEG and LINFOSEG given that the whole file is pack(1) and this restored the default.

File:

• trunk/libc/include/os2emx.h (modified) (4 diffs)

trunk/libc/include/os2emx.h

@@ -182 +182 @@
 # ifndef __volatile__
 #  define __volatile__ volatile
+# endif
+# ifndef  __extension__
+#  define  __extension__
 # endif
 # if !defined (INCL_LONGLONG_STRUCTS) && !defined (__WATCOMC__)
@@ -1476 +1479 @@
 
 
-#if 0 /* -pedantic generates annoying warnings here */
 typedef struct _FTIME
 {
-  USHORT twosecs : 5;
-  USHORT minutes : 6;
-  USHORT hours   : 5;
+  __extension__ USHORT twosecs : 5;
+  __extension__ USHORT minutes : 6;
+  __extension__ USHORT hours     : 5;
 } FTIME;
-#else
-typedef struct _FTIME
-{
-  unsigned twosecs : 5;
-  unsigned minutes : 6;
-  unsigned hours   : 5;
-} FTIME;
-#endif
 typedef FTIME *PFTIME;
 
-#if 0 /* -pedantic generates annoying warnings here */
 typedef struct _FDATE
 {
-  USHORT day   : 5;
-  USHORT month : 4;
-  USHORT year  : 7;
+  __extension__ USHORT day   : 5;
+  __extension__ USHORT month : 4;
+  __extension__ USHORT year  : 7;
 } FDATE;
-#else
-typedef struct _FDATE
-{
-  unsigned day   : 5;
-  unsigned month : 4;
-  unsigned year  : 7;
-} FDATE;
-#endif
 typedef FDATE *PFDATE;
 
@@ -13425 +13410 @@
 #if defined(INCL_DOSINFOSEG) && !defined(INCL_NO16BIT)
 
-#pragma pack(1)
 typedef struct _GINFOSEG
 {
@@ -13485 +13469 @@
 } LINFOSEG;
 typedef LINFOSEG *PLINFOSEG;
-#pragma pack()
 
 #ifndef PT_FULLSCREEN