debpslib build problem on windows gcc 8.1.0

[BlueHazzard]

to compile codeblocks on windows with mingw64 gcc 8.1.0 i had to use this patch to be able to compile. Otherwise i get the -fpermissive error about "can not convert from void to *"

Code Select Expand


Index: src/plugins/compilergcc/depslib/src/alloc.c
===================================================================
--- src/plugins/compilergcc/depslib/src/alloc.c (revision 11824)
+++ src/plugins/compilergcc/depslib/src/alloc.c (working copy)
@@ -4,7 +4,7 @@
  * This file is part of depslib.
  *
  * License is hereby granted to use this software and distribute it
- * freely, as long as this copyright notice is retained and modifications
+ * freely, as long as this copyright notice is retained and modifications
  * are clearly marked.
  *
  * ALL WARRANTIES ARE HEREBY DISCLAIMED.
@@ -24,12 +24,12 @@

ALLOC *alloc_init(int size, int nel)
{
- ALLOC *a = malloc(sizeof(ALLOC));
+ ALLOC *a = (ALLOC*) malloc(sizeof(ALLOC));
a->size = size;
a->nel = a->free = nel;
a->tail = 0;
a->next = 0;
- a->data = malloc(size * nel);
+ a->data = (char*) malloc(size * nel);
return a;
}

@@ -54,13 +54,13 @@

ALLOC *alloc2_init(int size)
{
- ALLOC *a = malloc(sizeof(ALLOC));
+ ALLOC *a = (ALLOC*) malloc(sizeof(ALLOC));
a->size = size;
a->nel = 0;
a->free = size;
a->tail = 0;
a->next = 0;
- a->data = malloc(size);
+ a->data = (char*) malloc(size);
return a;
}

Index: src/plugins/compilergcc/depslib/src/filent.c
===================================================================
--- src/plugins/compilergcc/depslib/src/filent.c (revision 11824)
+++ src/plugins/compilergcc/depslib/src/filent.c (working copy)
@@ -9,7 +9,7 @@
  * This file is part of jam.
  *
  * License is hereby granted to use this software and distribute it
- * freely, as long as this copyright notice is retained and modifications
+ * freely, as long as this copyright notice is retained and modifications
  * are clearly marked.
  *
  * ALL WARRANTIES ARE HEREBY DISCLAIMED.
@@ -74,7 +74,7 @@
# endif

void
-file_dirscan(
+file_dirscan(
const char *dir,
scanback func,
void *closure )
@@ -96,7 +96,7 @@
dir = *dir ? dir : ".";

  /* Special case \ or d:\ : enter it */
-
+
  if( f.f_dir.len == 1 && f.f_dir.ptr[0] == '\\' )
      (*func)( closure, dir, 0 /* not stat()'ed */, (time_t)0 );
  else if( f.f_dir.len == 3 && f.f_dir.ptr[1] == ':' )
@@ -243,7 +243,7 @@
** 15 characters (ie. don't fit into a ar_name
*/

- string_table = malloc(lar_size);
+ string_table = (char*) malloc(lar_size);
if (read(fd, string_table, lar_size) != lar_size)
    printf("error reading string table\n");
offset += SARHDR + lar_size;
Index: src/plugins/compilergcc/depslib/src/headers.c
===================================================================
--- src/plugins/compilergcc/depslib/src/headers.c (revision 11824)
+++ src/plugins/compilergcc/depslib/src/headers.c (working copy)
@@ -4,11 +4,11 @@
  * This file is part of depslib.
  *
  * License is hereby granted to use this software and distribute it
- * freely, as long as this copyright notice is retained and modifications
+ * freely, as long as this copyright notice is retained and modifications
  * are clearly marked.
  *
  * ALL WARRANTIES ARE HEREBY DISCLAIMED.
- *
+ *
  * Modifications:
  * - D support (search for "D support")
  * - Depth level counting (needed for D support)
@@ -41,7 +41,7 @@
LIST *result = 0;
char buf[1024];
int fnlen=strlen(file);
-
+
/*D support */
int dMode=0;
int dState=0;
@@ -65,7 +65,7 @@
if (!hdrre)
hdrre = my_regcomp("^[ ]*#[ ]*include[ ]*([<\"])([^\">]*)([\">]).*$");
re = hdrre;
-
+
/* D support */
if(dMode)
{
@@ -74,7 +74,7 @@
"^.*import[ \t]*([[A-Za-z_ \t]+=[ \t]*)?([A-Za-z_\\.]+)(\\:.+)?;.*$");
re = dimpre;
}
-
+
while (fgets(buf, sizeof(buf), f))
{
/* D support */
@@ -93,7 +93,7 @@
--dState;
}
}
-
+
/* Simple reduction of regex overhead */
if(strstr(buf, dMode ? "import" : "include"))
if (my_regexec(re, buf))
@@ -116,7 +116,7 @@
if(dState == 0)
continue;
}
-
+
buf2[0] = '<';
const char* p;
int j = 0;
@@ -138,7 +138,7 @@
if (DEBUG_HEADER)
printf("header found: %s\n", buf2);
}
-
+
/* D support */
if(dMode)
{
@@ -146,7 +146,7 @@
{
if(strchr(buf, ';'))
dState=0;
-
+
if(strchr(buf, '}'))
dState=0;
}
@@ -192,11 +192,11 @@
/* D support (doesn't affect C(++), because a source file is never included) */
if(depth == 0)
{
- cachekey=malloc(strlen(t)+sizeof("source:"));
+ cachekey= (char*) malloc(strlen(t)+sizeof("source:"));
strcpy((char*)cachekey,"source:");
strcpy((char*)cachekey+7,t);
}
-
+
if (!headerhash)
headerhash = hashinit(sizeof(HEADER), "headers");




there are some remove unused tabs also, that codeblocks did by itself, so i let them in.

The devPack plugin and the help plugin fail too to compile, but i did not fix them right now (the zlib library is the culprit). DevPack will be removed anyway...

any contradictions to move this to svn?

EDIT: NEVERMIND... I HAD THE C++ COMPILER SET TO COMPILE C CODE .... *headbang*
i let this here, if someone has the same error...