summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Oliver Stöneberg <firewave@users.noreply.github.com>2013-02-01 08:31:09 +0000
committer Oliver Stöneberg <firewave@users.noreply.github.com>2013-02-01 08:31:09 +0000
commit582ec9dce4f2d18adaa00a33e75b9b0b122612ca (patch)
treec4d9e0759f7b75abd943b484ca63e1a476983155 /src
parent55c4155a198ea9a4040bfa1029d25b36f2201218 (diff)
fixed typo in previous commit / fixed DEBUG compilation of pmwinmm.c and zlib
Diffstat (limited to 'src')
-rw-r--r--src/lib/portmidi/pmwinmm.c4
-rw-r--r--src/lib/zlib/zutil.c2
-rw-r--r--src/lib/zlib/zutil.h2
3 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/portmidi/pmwinmm.c b/src/lib/portmidi/pmwinmm.c
index af3dad8f8eb..fdfb3b39415 100644
--- a/src/lib/portmidi/pmwinmm.c
+++ b/src/lib/portmidi/pmwinmm.c
@@ -1436,9 +1436,7 @@ void pm_winmm_term( void )
int i;
#ifdef DEBUG
char msg[PM_HOST_ERROR_MSG_LEN];
-#endif
- //int doneAny = 0;
-#ifdef DEBUG
+ int doneAny = 0;
printf("pm_winmm_term called\n");
#endif
for (i = 0; i < pm_descriptor_index; i++) {
diff --git a/src/lib/zlib/zutil.c b/src/lib/zlib/zutil.c
index a412eeaa03c..0ff49fc9a2e 100644
--- a/src/lib/zlib/zutil.c
+++ b/src/lib/zlib/zutil.c
@@ -123,7 +123,7 @@ uLong ZEXPORT zlibCompileFlags()
int ZLIB_INTERNAL z_verbose = verbose;
void ZLIB_INTERNAL z_error (m)
- char *m;
+ const char *m;
{
fprintf(stderr, "%s\n", m);
exit(1);
diff --git a/src/lib/zlib/zutil.h b/src/lib/zlib/zutil.h
index 72df5358db9..e209ff1d2ad 100644
--- a/src/lib/zlib/zutil.h
+++ b/src/lib/zlib/zutil.h
@@ -218,7 +218,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
#ifdef DEBUG
# include <stdio.h>
extern int ZLIB_INTERNAL z_verbose;
- extern void ZLIB_INTERNAL z_error OF((char *m));
+ extern void ZLIB_INTERNAL z_error OF((const char *m));
# define Assert(cond,msg) {if(!(cond)) z_error(msg);}
# define Trace(x) {if (z_verbose>=0) fprintf x ;}
# define Tracev(x) {if (z_verbose>0) fprintf x ;}