(file) Return to Platform_WIN32_IX86_MSVC.h CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/Platform_WIN32_IX86_MSVC.h between version 1.22 and 1.29

version 1.22, 2004/10/17 20:39:17 version 1.29, 2005/11/09 22:34:09
Line 1 
Line 1 
 //%2004////////////////////////////////////////////////////////////////////////  //%2005////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 6 
Line 6 
 // IBM Corp.; EMC Corporation, The Open Group. // IBM Corp.; EMC Corporation, The Open Group.
 // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.; // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
   // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   // EMC Corporation; VERITAS Software Corporation; The Open Group.
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 65 
Line 67 
  
 #define PEGASUS_MAXHOSTNAMELEN  64 #define PEGASUS_MAXHOSTNAMELEN  64
  
   #define PEGASUS_DISABLE_INTERNAL_INLINES
   
   #define PEGASUS_SOCKET SOCKET
   #define PEGASUS_INVALID_SOCKET INVALID_SOCKET
   
 // Exclude rarely-used stuff from Windows headers // Exclude rarely-used stuff from Windows headers
 // Note: this is also an easy way to avoid the often introduced // Note: this is also an easy way to avoid the often introduced
 // winsock.h/winsock2.h mixing compiler error problems. // winsock.h/winsock2.h mixing compiler error problems.
Line 91 
Line 98 
 // Suppress this warning : "'this' : used in base member initializer list" // Suppress this warning : "'this' : used in base member initializer list"
 #pragma warning ( disable : 4355 ) #pragma warning ( disable : 4355 )
  
   //
   // Prior to Microsoft Visual Studio 7.0, there were no stream inserters for
   // __int64 and unsigned __int64. We declare them if the _MSC_VER is less than
   // 1300 (subtract 600 to get the version of Visual Studio). Look in
   // SystemWindows.cpp for the definitions.
   //
   #if (_MSC_VER < 1300)
   # include <iostream>
   namespace std
   {
       inline ostream& operator<<(ostream& os, const unsigned __int64& x)
       {
           char buffer[64];
           sprintf(buffer, "%" PEGASUS_64BIT_CONVERSION_WIDTH "u", x);
           return os << buffer;
       }
   
       inline ostream& operator<<(ostream& os, const __int64& x)
       {
           char buffer[64];
           sprintf(buffer, "%" PEGASUS_64BIT_CONVERSION_WIDTH "d", x);
           return os << buffer;
       }
   }
   #endif /* _MSC_VER < 1300 */
  
 #endif /* Pegasus_Platform_WIN32_IX86_MSVC_h */ #endif /* Pegasus_Platform_WIN32_IX86_MSVC_h */

Legend:
Removed from v.1.22  
changed lines
  Added in v.1.29
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2