OSDN Git Service
(root)
/
heavyosecpu
/
HeavyOSECPU.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git.sourceforge.jp:/gitroot/heavyosecpu/HeavyOSECPU
[heavyosecpu/HeavyOSECPU.git]
/
osecpu.h
diff --git
a/osecpu.h
b/osecpu.h
index
468f067
..
abcfd5f
100644
(file)
--- a/
osecpu.h
+++ b/
osecpu.h
@@
-1,4
+1,4
@@
-#ifndef _HDLOAD_OSECPU
+
#ifndef _HDLOAD_OSECPU
#define _HDLOAD_OSECPU 1
/* Visual Studio で fopen()やsprintf() などの古い関数を使用する時に出る警告を抑止する*/
@@
-240,5
+240,3
@@
int tek5Decomp(UCHAR *buf, UCHAR *buf1, UCHAR *tmp);
#endif
-
->>>>>>> 4d5d6fa61ff576ba035ee4bd882e8476f2ceeb2b