_JBLEN conflict on FreeBSD

[Francois Gouget]

Changelog:

 * include/msvcrt/setjmp.h

   Prefix _JBLEN to avoid conflict on FreeBSD



--
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
                         "Utilisateur" (nom commun) :
        Mot utilisé par les informaticiens en lieu et place d'"idiot".
-------------- next part --------------
Index: include/msvcrt/setjmp.h
===================================================================
RCS file: /home/wine/wine/include/msvcrt/setjmp.h,v
retrieving revision 1.1
diff -u -r1.1 setjmp.h
--- include/msvcrt/setjmp.h	2001/12/21 19:23:35	1.1
+++ include/msvcrt/setjmp.h	2002/01/27 05:27:00
@@ -16,9 +16,6 @@
 
 #ifdef __i386__
 
-#define _JBLEN                     16
-#define _JBTYPE                    int
-
 typedef struct __JUMP_BUFFER
 {
     unsigned long Ebp;
@@ -37,15 +34,23 @@
 
 #endif /* __i386__ */
 
-typedef _JBTYPE MSVCRT(jmp_buf)[_JBLEN];
+#ifndef USE_MSVCRT_PREFIX
+#define _JBLEN                     16
+#define _JBTYPE                    int
+typedef _JBTYPE                    jmp_buf[_JBLEN];
+#else
+#define MSVCRT__JBLEN              16
+#define MSVCRT__JBTYPE             int
+typedef MSVCRT__JBTYPE             MSVCRT_jmp_buf[MSVCRT__JBLEN];
+#endif
 
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-int         MSVCRT(_setjmp)( MSVCRT(jmp_buf));
-int         MSVCRT(longjmp)( MSVCRT(jmp_buf),int);
+int         MSVCRT(_setjmp)(MSVCRT(jmp_buf));
+int         MSVCRT(longjmp)(MSVCRT(jmp_buf),int);
 
 #ifdef __cplusplus
 }