Skip to content
Snippets Groups Projects
Commit f519dacf authored by Toni G's avatar Toni G
Browse files

dcd , pdb now c++

parent 9643b46e
No related branches found
No related tags found
No related merge requests found
...@@ -17,7 +17,7 @@ OBJ=dcdplugin.o gromacsplugin.o pdbplugin.o ...@@ -17,7 +17,7 @@ OBJ=dcdplugin.o gromacsplugin.o pdbplugin.o
obj: $(OBJ) obj: $(OBJ)
# Local rules for molfile plugins - replacement is delayed # Local rules for molfile plugins - replacement is delayed
CPPFLAGS+=-DSTATIC_PLUGIN -DVMDPLUGIN=molfile_$(patsubst %.o,%,$@) -fPIC CPPFLAGS+=-DSTATIC_PLUGIN -DVMDPLUGIN=molfile_$(patsubst %.o,%,$@)
# -fpermissive works around a missing cast in pdbplugin # -fpermissive works around a missing cast in pdbplugin
# char *newstr=realloc(pdb->meta->remarks, newlen + 1); # char *newstr=realloc(pdb->meta->remarks, newlen + 1);
......
File moved
...@@ -55,9 +55,9 @@ done ...@@ -55,9 +55,9 @@ done
mycp $PD/molfile_plugin/LICENSE COPYRIGHT mycp $PD/molfile_plugin/LICENSE COPYRIGHT
# List of "known-good" plugins. Some renaming is necessary # List of "known-good" plugins. Some renaming is necessary
mycp_wrap $IFDEF $PD/molfile_plugin/src/dcdplugin.c dcdplugin.c mycp_wrap $IFDEF $PD/molfile_plugin/src/dcdplugin.c dcdplugin.cpp
mycp_wrap $IFDEF $PD/molfile_plugin/src/gromacsplugin.C gromacsplugin.cpp mycp_wrap $IFDEF $PD/molfile_plugin/src/gromacsplugin.C gromacsplugin.cpp
mycp_wrap $IFDEF $PD/molfile_plugin/src/pdbplugin.c pdbplugin.c mycp_wrap $IFDEF $PD/molfile_plugin/src/pdbplugin.c pdbplugin.cpp
# Generate static header # Generate static header
......
...@@ -115,7 +115,7 @@ static void *open_pdb_read(const char *filepath, const char *filetype, ...@@ -115,7 +115,7 @@ static void *open_pdb_read(const char *filepath, const char *filetype,
int len=strlen(pdbstr); int len=strlen(pdbstr);
int newlen = len + pdb->meta->remarklen; int newlen = len + pdb->meta->remarklen;
char *newstr=realloc(pdb->meta->remarks, newlen + 1); char *newstr=(char*)realloc(pdb->meta->remarks, newlen + 1);
if (newstr != NULL) { if (newstr != NULL) {
pdb->meta->remarks = newstr; pdb->meta->remarks = newstr;
pdb->meta->remarks[pdb->meta->remarklen] = '\0'; pdb->meta->remarks[pdb->meta->remarklen] = '\0';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment