Changeset 9673 for trunk/include

Timestamp:

Jan 15, 2003, 11:41:13 AM (23 years ago)

Author:

sandervl

Message:

PF: Updates for GCC builds

Location:

trunk/include

Files:

• heapstring.h (modified) (2 diffs)
• odin32.dbg.emx.mk (modified) (3 diffs)
• odin32.rel.emx.mk (modified) (3 diffs)
• odin32.tools.emx.mk (modified) (4 diffs)
• win/ntddk.h (modified) (3 diffs)
• win/wine/exception.h (modified) (5 diffs)
• win32type.h (modified) (2 diffs)

trunk/include/heapstring.h

@@ -20 +20 @@
  * Prototypes                                                                *
  *****************************************************************************/
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 int    WIN32API lstrlenA       (LPCSTR arg1);
@@ -58 +61 @@
 INT WIN32API LocalToWideChar(LPWSTR pWide, LPSTR pLocal, INT dwChars);
 
+#ifdef __cplusplus
+}
+#endif
 
 /*****************************************************************************

trunk/include/odin32.dbg.emx.mk

@@ -1 @@
-# $Id: odin32.dbg.emx.mk,v 1.8 2003-01-06 13:24:19 sandervl Exp $
+# $Id: odin32.dbg.emx.mk,v 1.9 2003-01-15 10:41:11 sandervl Exp $
 
 #
@@ -40 +40 @@
 LD     = gcc
 LD2    = link386
-IMPLIB = emximp
+IMPLIB = implib
 ILIB   = emxomfar
 RC     = $(ODIN32_TOOLS)\wrc
@@ -50 +50 @@
 #
 ASFLAGS          = -Mb -Sc -Sv:ALP +Od -D:DEBUG
-IMPLIBFLAGS      = -o
+IMPLIBFLAGS      = /nologo
 ILIBFLAGS        = rcv
 RCFLAGS          = -s -I. -I$(CPPMAIN)\include  -D__WIN32OS2__

trunk/include/odin32.rel.emx.mk

@@ -1 @@
-# $Id: odin32.rel.emx.mk,v 1.8 2003-01-06 13:24:19 sandervl Exp $
+# $Id: odin32.rel.emx.mk,v 1.9 2003-01-15 10:41:11 sandervl Exp $
 
 #
@@ -41 +41 @@
 LD     = gcc
 LD2    = link386
-IMPLIB = emximp
+IMPLIB = implib
 ILIB   = emxomfar
 RC     = $(ODIN32_TOOLS)\wrc
@@ -51 +51 @@
 #
 ASFLAGS          = -Mb -Sc -Sv:ALP +Od -D:DEBUG
-IMPLIBFLAGS      = -o
+IMPLIBFLAGS      = /nologo
 ILIBFLAGS        = rcv
 RCFLAGS          = -s -I. -I$(CPPMAIN)\include -D__WIN32OS2__

trunk/include/odin32.tools.emx.mk

@@ -1 @@
-# $Id: odin32.tools.emx.mk,v 1.6 2003-01-06 13:24:20 sandervl Exp $
+# $Id: odin32.tools.emx.mk,v 1.7 2003-01-15 10:41:12 sandervl Exp $
 
 #
@@ -43 +43 @@
 .c{$(OBJDIR)}.obj:
 !ifdef USERAPP
-    $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -o$(OBJDIR)\$(@B).obj -c $<
+    $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -o $(OBJDIR)\$(@B).obj -c $<
 !else
-    $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -o$(OBJDIR)\$(@B).obj -c $<
+    $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -o $(OBJDIR)\$(@B).obj -c $<
 !endif
 
 .c.obj:
 !ifdef USERAPP
-    $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -o$(OBJDIR)\$(@B).obj -c $<
+    $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -o $(OBJDIR)\$(@B).obj -c $<
 !else
-    $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -o$(OBJDIR)\$(@B).obj -c $<
+    $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -o $(OBJDIR)\$(@B).obj -c $<
 !endif
 
@@ -65 +65 @@
 .cpp{$(OBJDIR)}.obj:
 !ifdef USERAPP
-    $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -o$(OBJDIR)\$(@B).obj -c $<
+    $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -o $(OBJDIR)\$(@B).obj -c $<
 !else
-    $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -o$(OBJDIR)\$(@B).obj -c $<
+    $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -o $(OBJDIR)\$(@B).obj -c $<
 !endif
 
 .cpp.obj:
 !ifdef USERAPP
-    $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -o$(OBJDIR)\$(@B).obj -c $<
+    $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -o $(OBJDIR)\$(@B).obj -c $<
 !else
-    $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -o$(OBJDIR)\$(@B).obj -c $<
+    $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -o $(OBJDIR)\$(@B).obj -c $<
 !endif
 
@@ -100 +100 @@
 .S{$(OBJDIR)}.obj:
 !ifdef USERAPP
-    $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -o$(OBJDIR)\$(@B).obj -c $<
+    $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -o $(OBJDIR)\$(@B).obj -c $<
 !else
-    $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -o$(OBJDIR)\$(@B).obj -c $<
+    $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -o $(OBJDIR)\$(@B).obj -c $<
 !endif
 

trunk/include/win/ntddk.h

@@ -799 +799 @@
 typedef TIME_FIELDS *PTIME_FIELDS;
 
-VOID WINAPI RtlSystemTimeToLocalTime(
-        IN  PLARGE_INTEGER SystemTime,
-        OUT PLARGE_INTEGER LocalTime);
-
-VOID WINAPI RtlTimeToTimeFields(
-        PLARGE_INTEGER liTime,
-        PTIME_FIELDS TimeFields);
+void      WINAPI RtlSystemTimeToLocalTime(PLARGE_INTEGER,PLARGE_INTEGER);
+void      WINAPI RtlTimeToTimeFields(const LARGE_INTEGER*,PTIME_FIELDS);
 
 BOOLEAN WINAPI RtlTimeFieldsToTime(
@@ -814 +809 @@
         PLARGE_INTEGER liTime,
         PTIME_FIELDS TimeFields);
-        
-void    WINAPI NtQuerySystemTime( LARGE_INTEGER *time );
-
-BOOLEAN WINAPI RtlTimeToSecondsSince1980( const FILETIME *time, LPDWORD res );
-BOOLEAN WINAPI RtlTimeToSecondsSince1970( const FILETIME *time, LPDWORD res );
-void    WINAPI RtlSecondsSince1970ToTime( DWORD time, FILETIME *res );
-void    WINAPI RtlSecondsSince1980ToTime( DWORD time, FILETIME *res );
+
+NTSTATUS  WINAPI NtQuerySystemTime(PLARGE_INTEGER);     
+
+void      WINAPI RtlSecondsSince1970ToTime(DWORD,LARGE_INTEGER *);
+void      WINAPI RtlSecondsSince1980ToTime(DWORD,LARGE_INTEGER *);
+BOOLEAN   WINAPI RtlTimeToSecondsSince1970(const LARGE_INTEGER *,PULONG);
+BOOLEAN   WINAPI RtlTimeToSecondsSince1980(const LARGE_INTEGER *,LPDWORD);
 
 typedef struct tagRTL_BITMAP {
@@ -1095 +1090 @@
         OUT PBOOLEAN AccessStatus);
 
+NTSTATUS  WINAPI RtlQueryTimeZoneInformation(LPTIME_ZONE_INFORMATION);
+
 #ifdef __cplusplus
 }

trunk/include/win/wine/exception.h

@@ -1 @@
-/* $Id: exception.h,v 1.2 2002-04-07 17:33:06 sandervl Exp $ */
+/* $Id: exception.h,v 1.3 2003-01-15 10:41:13 sandervl Exp $ */
 /*
  * Wine exception handling
@@ -77 +77 @@
              __f.frame.Handler = (PEXCEPTION_HANDLER)WINE_exception_handler; \
              __f.u.filter = (func); \
-             EXC_push_frame( &__f.frame ); \
+             __wine_push_frame( &__f.frame ); \
              if (setjmp( __f.jmp)) { \
                  const __WINE_FRAME * const __eptr WINE_UNUSED = &__f; \
@@ -98 +98 @@
              __f.frame.Handler = (PEXCEPTION_HANDLER)WINE_finally_handler; \
              __f.u.finally_func = (func); \
-             EXC_push_frame( &__f.frame ); \
+             __wine_push_frame( &__f.frame ); \
              __first = 0; \
          } \
@@ -137 +137 @@
 #endif /* USE_COMPILER_EXCEPTIONS */
 
-static inline EXCEPTION_FRAME * WINE_UNUSED EXC_push_frame( EXCEPTION_FRAME *frame )
+static inline EXCEPTION_FRAME * WINE_UNUSED __wine_push_frame( EXCEPTION_FRAME *frame )
 {
 #if defined(__GNUC__) && defined(__i386__)
@@ -154 +154 @@
 }
 
-static inline EXCEPTION_FRAME * WINE_UNUSED EXC_pop_frame( EXCEPTION_FRAME *frame )
+static inline EXCEPTION_FRAME * WINE_UNUSED __wine_pop_frame( EXCEPTION_FRAME *frame )
 {
 #if defined(__GNUC__) && defined(__i386__)

trunk/include/win32type.h

@@ -28 +28 @@
  *****************************************************************************/
 
-#ifndef OS2DEF_INCLUDED
+#if !(defined(OS2DEF_INCLUDED)) && !(defined(__EMX__))
 // void
 typedef void            VOID;
@@ -96 +96 @@
  *****************************************************************************/
 
-#if !(defined(__WINE_WINDEF_H) || defined(OS2DEF_INCLUDED))
+#if !(defined(__WINE_WINDEF_H) || defined(OS2DEF_INCLUDED) || defined(__EMX__) )
 
 typedef       unsigned int    INT;