Attachment #227843 for bug #315387

View | Details | Raw Unified | Return to bug 315387
Collapse All | Expand All

Lines 347-356 Link Here

(-)src/file_.cpp (-2 / +2 lines)
347	if (i>0) sleep ( 1 );	347	if (i>0) sleep ( 1 );
348	#endif	348	#endif
349	if (TextMode) {	349	if (TextMode) {
350	if (ReadOnly) hFile = fopen ( FName,"r" );	350	if (ReadOnly) hFile = fopen ( FName,"rt" );
351	else hFile = fopen ( FName,"r+t" );	351	else hFile = fopen ( FName,"r+t" );
352	} else {	352	} else {
353	if (ReadOnly) hFile = fopen ( FName,"r" );	353	if (ReadOnly) hFile = fopen ( FName,"rb" );
354	else hFile = fopen ( FName,"r+b" );	354	else hFile = fopen ( FName,"r+b" );
355	}	355	}
356	#ifndef _MVS	356	#ifndef _MVS

Lines 127-134 Link Here

(-)src/machine_.h (-2 / +36 lines)
127	# define CALL_LIKE_VMS 1	127	# define CALL_LIKE_VMS 1
128		128
129	// MVS stands for Microsoft Visual Studio	129	// MVS stands for Microsoft Visual Studio
130	#elif defined(_MVS)	130	#elif defined(_MSC_VER)
		131	# if (_MSC_VER) >= 800
		132	# define CALL_LIKE_MVS 2
		133	# else
131	# define CALL_LIKE_MVS 1	134	# define CALL_LIKE_MVS 1
		135	# endif
132		136
133	#elif defined(F2C) \|\| defined(G77)	137	#elif defined(F2C) \|\| defined(G77)
134	# define CALL_LIKE_SUN 8	138	# define CALL_LIKE_SUN 8
Lines 400-405 Link Here
400		404
401	#elif defined(CALL_LIKE_MVS)	405	#elif defined(CALL_LIKE_MVS)
402		406
		407	# if ( CALL_LIKE_MVS == 2 )
		408
		409	typedef pstr fpstr;
		410
		411	# define FTN_STR(s) s
		412	# define FTN_LEN(s) s##_len
		413
		414	# define char_struct(s) \
		415	pstr s; \
		416	int s##_len;
		417	# define fill_char_struct(s,str) \
		418	s = str; \
		419	s##_len = strlen(str);
		420
		421	# ifdef __cplusplus
		422	# define FORTRAN_SUBR(NAME,name,p_sun,p_stardent,p_mvs) \
		423	extern "C" void NAME p_sun
		424	# else
		425	# define FORTRAN_SUBR(NAME,name,p_sun,p_stardent,p_mvs) \
		426	void NAME p_sun
		427	# endif
		428
		429	# define FORTRAN_EXTERN(NAME,name,p_sun,p_stardent,p_mvs) \
		430	extern "C" void NAME p_sun
		431
		432	# define FORTRAN_CALL(NAME,name,p_sun,p_stardent,p_mvs) \
		433	NAME p_sun
		434
		435	# else
		436
403	typedef pstr fpstr;	437	typedef pstr fpstr;
404		438
405	# define FTN_STR(s) s	439	# define FTN_STR(s) s
Lines 425-431 Link Here
425		459
426	# define FORTRAN_CALL(NAME,name,p_sun,p_stardent,p_mvs) \	460	# define FORTRAN_CALL(NAME,name,p_sun,p_stardent,p_mvs) \
427	NAME p_mvs	461	NAME p_mvs
428		462	# endif
429	#else	463	#else
430		464
431	# error Unknown machine!!!	465	# error Unknown machine!!!

Lines 672-678 Link Here

(-)src/mmdb_chain.cpp (-1 / +2 lines)
672	i = 0;	672	i = 0;
673	sN = 1;	673	sN = 1;
674	while (i<numRes) {	674	while (i<numRes) {
675	PutInteger ( &(S[8]),sN,2 );	675	//PutInteger ( &(S[8]),sN,2 );
		676	PutInteger ( &(S[7]),sN,3 );
676	k = 19;	677	k = 19;
677	while ((i<numRes) && (k<70)) {	678	while ((i<numRes) && (k<70)) {
678	if (resName[i][0])	679	if (resName[i][0])




SegID    sgID;
Element  element;
PCAtom   atom;
pstr     p;
char     charge[10];

  strcpy ( LastFunc,"MMDB_F_Atom" );

    } else
      charge [0] = char(0);

/*
    if (FTN_STR(ID)[0]==' ')  {
      atomName[0] = char(0);
      if ((FTN_STR(AtNam)[1]=='H') && (FTN_STR(AtNam)[0]!='H') ||
          ((FTN_STR(AtNam)[1]=='D') && (FTN_STR(ID)[2]=='D')))  {
        i = 0;
        while ((i<nHydAtomNames) && 

        if (i<nHydAtomNames)
          GetStrTer ( atomName,FTN_STR(AtNam),4,5,FTN_LEN(AtNam) );
      }

      if ((FTN_STR(AtNam)[0]=='A') || ((FTN_STR(AtNam)[0]=='N') && (FTN_STR(ID)[1]!='N'))) {
        GetStrTer ( atomName,FTN_STR(AtNam),4,5,FTN_LEN(AtNam) );
      } else if ((FTN_STR(ID)[1]=='N') && ( (FTN_STR(AtNam)[0]=='N') && (FTN_STR(AtNam)[1]=='N') )) {
        GetStrTer ( atomName,FTN_STR(AtNam),4,5,FTN_LEN(AtNam) );
      } else if (!atomName[0])  {
        atomName[0] = ' ';
        GetStrTer ( &(atomName[1]),FTN_STR(AtNam),3,4,FTN_LEN(AtNam) );
      }
    } else
*/
      GetStrTer ( atomName,FTN_STR(AtNam),4,5,4 );



Lines 1320-1326 Link Here

(-)src/mmdb_sbase0.cpp (+4 lines)
1320	dirpath = new char[i+10];	1320	dirpath = new char[i+10];
1321	strcpy ( dirpath,path );	1321	strcpy ( dirpath,path );
1322	if (i>0) {	1322	if (i>0) {
		1323	#if defined(_MSC_VER) \|\| defined (WIN32)
		1324	if (dirpath[i-1]!='\\') strcat ( dirpath,"\\" );
		1325	#else
1323	if (dirpath[i-1]!='/') strcat ( dirpath,"/" );	1326	if (dirpath[i-1]!='/') strcat ( dirpath,"/" );
		1327	#endif
1324	}	1328	}
1325	}	1329	}
1326		1330

Lines 1158-1164 Link Here

(-)src/mmdb_selmngr.cpp (-1 / +1 lines)
1158	int selKey // selection key	1158	int selKey // selection key
1159	) {	1159	) {
1160	int i,j,k,n,m1,m2,c, sk,nsel;	1160	int i,j,k,n,m1,m2,c, sk,nsel;
1161	Boolean noRes,modelSel,chainSel,resSel,selAND;	1161	Boolean noRes,modelSel(False),chainSel,resSel,selAND;
1162	PCModel model;	1162	PCModel model;
1163	PCChain chain;	1163	PCChain chain;
1164	PCResidue res;	1164	PCResidue res;

Lines 1381-1386 Link Here

(-)src/mmdb_title.cpp (+4 lines)
1381	#define R350_CHAINS 2	1381	#define R350_CHAINS 2
1382	#define R350_BIOMT 3	1382	#define R350_BIOMT 3
1383		1383
		1384	#ifdef _WIN32
		1385	#define strcasestr(s, t) strstr(strupr(s), t)
		1386	#endif
		1387
1384	void getRemarkKey ( RPCRemark rem, int & lkey ) {	1388	void getRemarkKey ( RPCRemark rem, int & lkey ) {
1385	if (rem) {	1389	if (rem) {
1386	if (rem->remarkNum!=350) lkey = R350_END;	1390	if (rem->remarkNum!=350) lkey = R350_END;

Return to bug 315387

Lines 1478-1484 Link Here

(-)src/mmdb_rwbrook.cpp (-5 / +7 lines)
1478	SegID sgID;	1478	SegID sgID;
1479	Element element;	1479	Element element;
1480	PCAtom atom;	1480	PCAtom atom;
1481	pstr p;
1482	char charge[10];	1481	char charge[10];
1483		1482
1484	strcpy ( LastFunc,"MMDB_F_Atom" );	1483	strcpy ( LastFunc,"MMDB_F_Atom" );
Lines 1552-1561 Link Here
1552	} else	1551	} else
1553	charge [0] = char(0);	1552	charge [0] = char(0);
1554		1553
1555	/*
1556	if (FTN_STR(ID)[0]==' ') {	1554	if (FTN_STR(ID)[0]==' ') {
1557	atomName[0] = char(0);	1555	atomName[0] = char(0);
1558	if ((FTN_STR(AtNam)[1]=='H') \|\|	1556	if ((FTN_STR(AtNam)[1]=='H') && (FTN_STR(AtNam)[0]!='H') \|\|
1559	((FTN_STR(AtNam)[1]=='D') && (FTN_STR(ID)[2]=='D'))) {	1557	((FTN_STR(AtNam)[1]=='D') && (FTN_STR(ID)[2]=='D'))) {
1560	i = 0;	1558	i = 0;
1561	while ((i<nHydAtomNames) &&	1559	while ((i<nHydAtomNames) &&
Lines 1563-1574 Link Here
1563	if (i<nHydAtomNames)	1561	if (i<nHydAtomNames)
1564	GetStrTer ( atomName,FTN_STR(AtNam),4,5,FTN_LEN(AtNam) );	1562	GetStrTer ( atomName,FTN_STR(AtNam),4,5,FTN_LEN(AtNam) );
1565	}	1563	}
1566	if (!atomName[0]) {	1564
		1565	if ((FTN_STR(AtNam)[0]=='A') \|\| ((FTN_STR(AtNam)[0]=='N') && (FTN_STR(ID)[1]!='N'))) {
		1566	GetStrTer ( atomName,FTN_STR(AtNam),4,5,FTN_LEN(AtNam) );
		1567	} else if ((FTN_STR(ID)[1]=='N') && ( (FTN_STR(AtNam)[0]=='N') && (FTN_STR(AtNam)[1]=='N') )) {
		1568	GetStrTer ( atomName,FTN_STR(AtNam),4,5,FTN_LEN(AtNam) );
		1569	} else if (!atomName[0]) {
1567	atomName[0] = ' ';	1570	atomName[0] = ' ';
1568	GetStrTer ( &(atomName[1]),FTN_STR(AtNam),3,4,FTN_LEN(AtNam) );	1571	GetStrTer ( &(atomName[1]),FTN_STR(AtNam),3,4,FTN_LEN(AtNam) );
1569	}	1572	}
1570	} else	1573	} else
1571	*/
1572	GetStrTer ( atomName,FTN_STR(AtNam),4,5,4 );	1574	GetStrTer ( atomName,FTN_STR(AtNam),4,5,4 );
1573		1575
1574		1576