[CF-Devel] Re: [Crossfire-cvs] CVS commit: crossfire
crossfire-devel-admin at archives.real-time.com
crossfire-devel-admin at archives.real-time.com
Sat Aug 2 14:58:25 CDT 2003
crossfire-cvs-admin at lists.sourceforge.net
wrote
Please do not use // style comments.
That is not legal ANSI C, and some compilers will error when using those (in
theory, any that actually conforms properly to ANSI C).
If they are all with #ifdef WIN32 areas, I don't care. But some of the ones I
see below are after the #else or #endif. So non WIN32 systems will see those
comments, and if using a properly conforming compiler (not gcc), the code will
not be compilable!
>
>
>
Start of context diffs
>
>
>
Index: crossfire/common/map.c
>
diff -c crossfire/common/map.c:1.55 crossfire/common/map.c:1.56
>
*** crossfire/common/map.c:1.55 Mon Jun 30 12:14:13 2003
>
--- crossfire/common/map.c Sat Aug 2 09:25:23 2003
>
***************
>
*** 1,6 ****
>
/*
>
* static char *rcsid_map_c =
>
! * "$Id: map.c,v 1.55 2003/06/30 19:14:13 tchize Exp $";
>
*/
>
>
/*
>
--- 1,6 ----
>
/*
>
* static char *rcsid_map_c =
>
! * "$Id: map.c,v 1.56 2003/08/02 16:25:23 tchize Exp $";
>
*/
>
>
/*
>
***************
>
*** 179,187 ****
>
>
int check_path (char *name, int prepend_dir)
>
{
>
- #ifdef WIN32 /* ***win32: check this sucker in windows style. */
>
- return(_access(name,0));
>
- #else
>
char buf[MAX_BUF], *endbuf;
>
struct stat statbuf;
>
int mode = 0, i;
>
--- 179,184 ----
>
***************
>
*** 190,195 ****
>
--- 187,195 ----
>
strcpy (buf, create_pathname(name));
>
else
>
strcpy(buf, name);
>
+ #ifdef WIN32 /* ***win32: check this sucker in windows style. */
>
+ return(_access(name,0));
>
+ #else
>
>
/* old method (strchr(buf, '\0')) seemd very odd to me -
>
* this method should be equivalant and is clearer.
>
>
Index: crossfire/include/global.h
>
diff -c crossfire/include/global.h:1.41 crossfire/include/global.h:1.42
>
*** crossfire/include/global.h:1.41 Fri Mar 7 21:35:32 2003
>
--- crossfire/include/global.h Sat Aug 2 09:25:22 2003
>
***************
>
*** 1,6 ****
>
/*
>
* static char *rcsid_global_h =
>
! * "$Id: global.h,v 1.41 2003/03/08 05:35:32 mwedel Exp $";
>
*/
>
>
/*
>
--- 1,6 ----
>
/*
>
* static char *rcsid_global_h =
>
! * "$Id: global.h,v 1.42 2003/08/02 16:25:22 tchize Exp $";
>
*/
>
>
/*
>
***************
>
*** 59,64 ****
>
--- 59,74 ----
>
typedef signed char sint8;
>
typedef unsigned short Fontindex;
>
>
+ #ifdef WIN32
>
+ // Python plugin stuff defines SIZEOF_LONG_LONG as 8, and besides __int64 is a 64b type on MSVC...
>
+ // So let's force the typedef
>
+ typedef unsigned __int64 uint64;
>
+ typedef signed __int64 sint64;
>
+ // Needed for experience
>
+ #define atoll _atoi64
>
+
>
+ #else // WIN32
>
+
>
#if SIZEOF_LONG == 8
>
typedef unsigned long uint64;
>
typedef signed long sint64;
>
***************
>
*** 70,76 ****
>
error correct and send mail to crossfire-devel on how to do this
>
#endif
>
>
!
>
>
>
/* global stuff used by new skill/experience system -b.t.
>
--- 80,86 ----
>
error correct and send mail to crossfire-devel on how to do this
>
#endif
>
>
! #endif // WIN32
>
>
>
/* global stuff used by new skill/experience system -b.t.
>
>
>
-------------------------------------------------------
>
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
>
Data Reports, E-commerce, Portals, and Forums are available now.
>
Download today and enter to win an XBOX or Visual Studio .NET.
>
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
>
_______________________________________________
>
Crossfire-cvs mailing list
>
Crossfire-cvs at lists.sourceforge.net
>
https://lists.sourceforge.net/lists/listinfo/crossfire-cvs
_______________________________________________
crossfire-devel mailing list
crossfire-devel at lists.real-time.com
https://mailman.real-time.com/mailman/listinfo/crossfire-devel
More information about the crossfire
mailing list