diff options
| author | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-05-26 16:38:08 +0000 |
|---|---|---|
| committer | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-05-26 16:38:08 +0000 |
| commit | 9a9de7689176de013872e5a6a5367f79202d0844 (patch) | |
| tree | aaf098cfd51175b9e1d675fd21373d0c3de5ef8d /Magic2/ModelFileMAG.cpp | |
| parent | 75f9af66439ec416634188eb3ef020df4e4752b7 (diff) | |
| download | starshatter-9a9de7689176de013872e5a6a5367f79202d0844.zip starshatter-9a9de7689176de013872e5a6a5367f79202d0844.tar.gz starshatter-9a9de7689176de013872e5a6a5367f79202d0844.tar.bz2 | |
Getting closer to getting magic to compile. The file renaming was necessary in order to remove a conflict between the WinSDK's locale.h and starshatter's own version.
Diffstat (limited to 'Magic2/ModelFileMAG.cpp')
| -rw-r--r-- | Magic2/ModelFileMAG.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Magic2/ModelFileMAG.cpp b/Magic2/ModelFileMAG.cpp index 4157434..953f22d 100644 --- a/Magic2/ModelFileMAG.cpp +++ b/Magic2/ModelFileMAG.cpp @@ -78,7 +78,7 @@ ModelFileMAG::Load(Model* m, double scale) }
ZeroMemory(pname, 64);
- strncpy_s(pname, filename, 63);
+ strncpy(pname, filename, 63);
char file_id[5];
fread(file_id, 4, 1, fp);
|