[SCM] Rasmol packaging branch, p/intwidth, updated. upstream/2.7.5-4-g1167bfd

[Teemu Ikonen]

The following commit has been merged in the p/intwidth branch:
commit 1167bfda1694dc86a12125daa78e2b327479e181
Merge: 162f1d42436f95d53849c5034144785c56b01b32 0e65c857800f66c3fa254e27c27c9a8566d16b68
Author: Teemu Ikonen <tpikonen at gmail.com>
Date:   Tue Sep 27 19:59:02 2011 +0200

    Merge branch 'upstream' into p/intwidth

diff --combined src/rasmol.h
index ff40939,94e3640..b6cde5e
--- a/src/rasmol.h
+++ b/src/rasmol.h
@@@ -78,7 -78,6 +78,7 @@@
  /* rasmol.h
   */
  
 +#include <stdint.h>
  
  /*===========================*/
  /*  User Definable Options!  */
@@@ -187,9 -186,9 +187,9 @@@
  /*==============================*/
  
  #define MAIN_COPYRIGHT "Copyright (C) Roger Sayle 1992-1999"
- #define VERSION "2.7.5"
- #define VER_COPYRIGHT "Copyright (C) Herbert J. Bernstein 1998-2008"
- #define VER_DATE "June 2009"
+ #define VERSION "2.7.5.2"
+ #define VER_COPYRIGHT "Copyright (C) Herbert J. Bernstein 1998-2011"
+ #define VER_DATE "May 2011"
  
  #ifndef True
  #define True  1
@@@ -203,7 -202,7 +203,7 @@@
  
  typedef double Real;
  #ifndef APPLEMAC
 -typedef unsigned char Byte;
 +typedef uint8_t Byte;
  #endif
  
  #ifdef __STDC__
@@@ -212,18 -211,21 +212,18 @@@ typedef signed char Char
  typedef char Char;
  #endif
  
 -#ifdef _LONGLONG
 -typedef unsigned int Card;
 -typedef int Long;
 -#else
 -typedef unsigned long Card;
 +typedef uint32_t Card;
 +/* Long has to be defined as long, instead of int32_t because of
 +   multiple printf and scanf calls using %ld in the format. */
  typedef long Long;
 -#endif
  
  #ifdef EIGHTBIT
 -typedef unsigned char Pixel;
 +typedef uint8_t Pixel;
  #else
  #ifdef THIRTYTWOBIT
 -typedef Long Pixel;
 +typedef int32_t Pixel;
  #else
 -typedef short Pixel;
 +typedef int16_t Pixel;
  #endif
  #endif
  
@@@ -247,6 -249,7 +247,7 @@@
  #define ToUpper(x)   (islower((x))?toupper((x)):(x))
  #endif
  
+ 
  #if !defined(IBMPC) || defined(_WIN32)
  #ifdef APPLEMAC
  #define _fmalloc   NewPtrSys
@@@ -281,8 -284,10 +282,10 @@@
  #define AdvPickCoord    7
  
  
+ #define MSG_MAX 256
  void WriteChar( int );
  void WriteString( char* );
+ void WriteMsg( char* );
  void RasMolFatalExit( char* );
  void AdviseUpdate( int );
  void RefreshScreen( void );

-- 
Rasmol packaging