Changeset 26649

Timestamp:

2013-01-10T15:23:59+13:00 (11 years ago)

Author:

davidb

Message:

Code changed from using WIN32 use to _MSC_VER (the difference being the former is set for any Windows based compiler, whilst the latter is specifically set by a MicroSoft Visual Studio compiler). Up to this point the difference was not important, however to allow for cross-compilation (using mingw under Linux to produce native Windows binaries) the difference is imporant, and needs to be used more carefully

File:

• main/trunk/greenstone2/common-src/src/getpw/getpw.cpp (modified) (5 diffs)

main/trunk/greenstone2/common-src/src/getpw/getpw.cpp

@@ -54 +54 @@
 
 // include crypt
-#if defined(__WIN32__)
+#if defined(_MSC_VER)
 #  include <windows.h>
 #  include <stdio.h>
@@ -60 +60 @@
 #else
 #  include "config.h"
-#  if defined(HAVE_CRYPT_H)
+#  include <getpass.h>
 #  include <crypt.h>
-#  endif
+
 
 #  if defined(HAVE_UNISTD_H)
@@ -70 +70 @@
    but for now we'll do nothing about it... */
 
-#endif  /* not WIN32 */
+#endif  /* not _MSC_VER */
 
 #include <string.h>
 //#include <pwd.h>
 
-#if defined(__WIN32__)
+#if defined(_MSC_VER)
 char* getPassword(HANDLE hSTDIN)
 {
@@ -127 +127 @@
   
   for (i=0; i<3; i++)  {
-#if defined(__WIN32__)
+#if defined(_MSC_VER)
     HANDLE hSTDIN;
     DWORD fdwMode, fdwPrevMode;
@@ -165 +165 @@
     strcpy (c, a);
     
-#if defined(__WIN32__)
+#if defined(_MSC_VER)
     cerr << "Re-enter password: ";
     char* b = getPassword(hSTDIN);