Revision: 77703
http://sourceforge.net/p/brlcad/code/77703
Author: starseeker
Date: 2020-11-07 02:19:55 +0000 (Sat, 07 Nov 2020)
Log Message:
-----------
See if we can go with _WIN32
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/stepcode/include/stepcode/express/basic.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/stepcode/express/error.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/editor/STEPfile.inline.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/utils/dirobj.cc
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/include/stepcode/express/basic.h
===================================================================
---
brlcad/branches/extbuild/src/other/ext/stepcode/include/stepcode/express/basic.h
2020-11-07 01:28:07 UTC (rev 77702)
+++
brlcad/branches/extbuild/src/other/ext/stepcode/include/stepcode/express/basic.h
2020-11-07 02:19:55 UTC (rev 77703)
@@ -106,7 +106,7 @@
/******************************/
#if !defined(static_inline)
-#if (!defined(__GNUC__) && !defined(__MSVC__)) || defined(__STRICT_ANSI)
+#if (!defined(__GNUC__) && !defined(_WIN32)) || defined(__STRICT_ANSI)
#define static_inline
#undef supports_inline_functions
#else
@@ -131,7 +131,7 @@
# define PROTO(x) x
# else
-# if defined(__CLCC__) || defined(__MSVC__) || defined(__BORLAND__)
+# if defined(__CLCC__) || defined(_WIN32) || defined(__BORLAND__)
# define PROTO(x) x
#else
# define PROTO(x) ()
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/include/stepcode/express/error.h
===================================================================
---
brlcad/branches/extbuild/src/other/ext/stepcode/include/stepcode/express/error.h
2020-11-07 01:28:07 UTC (rev 77702)
+++
brlcad/branches/extbuild/src/other/ext/stepcode/include/stepcode/express/error.h
2020-11-07 02:19:55 UTC (rev 77703)
@@ -116,7 +116,7 @@
/* function prototypes */
/***********************/
-#if defined(__MSVC__) || defined(__BORLAND__)
+#if defined(_WIN32) || defined(__BORLAND__)
extern STEPCODE_EXPRESS_EXPORT void ERROR_start_message_buffer PROTO( ( void )
);
extern STEPCODE_EXPRESS_EXPORT void ERROR_flush_message_buffer PROTO( ( void )
);
#endif
@@ -142,7 +142,7 @@
}
static_inline void ERRORbuffer_messages( bool flag ) {
-#if !defined(__MSVC__) && !defined(__BORLAND__)
+#if !defined(_WIN32) && !defined(__BORLAND__)
extern void ERROR_start_message_buffer( void ),
ERROR_flush_message_buffer( void );
#endif
@@ -155,7 +155,7 @@
}
static_inline void ERRORflush_messages( void ) {
-#if !defined(__MSVC__) && !defined(__BORLAND__)
+#if !defined(_WIN32) && !defined(__BORLAND__)
extern void ERROR_start_message_buffer( void ),
ERROR_flush_message_buffer( void );
#endif
@@ -183,7 +183,7 @@
extern STEPCODE_EXPRESS_EXPORT void ERRORreport_with_symbol PROTO( ( Error,
struct Symbol_ *, ... ) );
extern STEPCODE_EXPRESS_EXPORT void ERRORreport_with_line PROTO( ( Error, int,
... ) );
-#if !defined(__MSVC__) && !defined(__BORLAND__)
+#if !defined(_WIN32) && !defined(__BORLAND__)
extern STEPCODE_EXPRESS_EXPORT void ERROR_start_message_buffer PROTO( ( void )
);
extern STEPCODE_EXPRESS_EXPORT void ERROR_flush_message_buffer PROTO( ( void )
);
#endif
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/src/editor/STEPfile.inline.cc
===================================================================
---
brlcad/branches/extbuild/src/other/ext/stepcode/src/editor/STEPfile.inline.cc
2020-11-07 01:28:07 UTC (rev 77702)
+++
brlcad/branches/extbuild/src/other/ext/stepcode/src/editor/STEPfile.inline.cc
2020-11-07 02:19:55 UTC (rev 77703)
@@ -87,7 +87,7 @@
** from filename
*/
std::string STEPfile::TruncFileName( const std::string filename ) const {
-#if defined(__WIN32__) && !defined(__mingw32__)
+#if defined(_WIN32) && !defined(__mingw32__)
char slash = '\\';
#else
char slash = '/';
Modified: brlcad/branches/extbuild/src/other/ext/stepcode/src/utils/dirobj.cc
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/src/utils/dirobj.cc
2020-11-07 01:28:07 UTC (rev 77702)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/src/utils/dirobj.cc
2020-11-07 02:19:55 UTC (rev 77703)
@@ -57,7 +57,7 @@
#include <string>
#include <iostream>
-#if defined(__WIN32__)
+#if defined(_WIN32)
#include <shlwapi.h>
#endif
@@ -149,7 +149,7 @@
bool DirObj::Reset( const std::string & path ) {
bool successful = IsADirectory( path.c_str() );
if( successful ) {
-#ifdef __WIN32__
+#ifdef _WIN32
WIN32_FIND_DATA FindFileData;
HANDLE hFind;
@@ -186,7 +186,7 @@
///////////////////////////////////////////////////////////////////////////////
bool DirObj::IsADirectory( const char * path ) {
-#if defined(__WIN32__)
+#if defined(_WIN32)
if( PathIsDirectory( path ) ) {
return true;
}
@@ -221,7 +221,7 @@
std::string DirObj::Normalize( const std::string & path ) {
std::string buf;
const char * slash;
-#if defined(__WIN32__)
+#if defined(_WIN32)
char b[MAX_PATH];
PathCanonicalize( b, path.c_str() );
slash = "\\";
@@ -235,7 +235,7 @@
} else {
buf.assign( b );
-#if !defined(__WIN32__)
+#if !defined(_WIN32)
free(b);
#endif
}
@@ -258,7 +258,7 @@
///////////////////////////////////////////////////////////////////////////////
const char * DirObj::ValidDirectories( const char * path ) {
-#ifdef __WIN32__
+#ifdef _WIN32
static char buf[MAX_PATH + 1];
#else
static char buf[MAXPATHLEN + 1];
@@ -312,7 +312,7 @@
CheckIndex( index );
spot = &fileList[index];
}
-#ifdef __MSVC__
+#ifdef _WIN32
char * string = _strdup( f );
#else
char * string = strdup( f );
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
