Changeset 363

Timestamp:

11/23/07 17:39:02 (17 years ago)

Author:

r2d

Message:

• corrections to compile with msvc c (c89?)
• removed headers from other lib

Location:

libmpc/trunk

Files:

• mpc2sv8/mpc2sv8.c (modified) (1 diff)
• win32/basename.c (modified) (3 diffs)
• win32/dirent.c (modified) (1 diff)
• win32/libgen.h (modified) (1 diff)

libmpc/trunk/mpc2sv8/mpc2sv8.c

@@ -233 +233 @@
         int c, i;
         mpc_bool_t overwrite = MPC_FALSE, use_dir = MPC_FALSE;
+        int ret = MPC_STATUS_OK;
         printf(About);
-        int ret = MPC_STATUS_OK;
 
         while ((c = getopt(argc , argv, "oh")) != -1) {

libmpc/trunk/win32/basename.c

@@ -48 +48 @@
      * in which to create a wide character reference copy of path
      */
-
-    wchar_t refcopy[1 + (len = mbstowcs( NULL, path, 0 ))];
+          
+    wchar_t * refcopy, * refpath;
+    len = mbstowcs( NULL, path, 0 );
+    refcopy = malloc((1 + len) * sizeof(wchar_t));
 
     /* create the wide character reference copy of path,
@@ -55 +57 @@
      */
 
-    wchar_t *refpath = refcopy;
+    refpath = refcopy;
     if( ((len = mbstowcs( refpath, path, len )) > 1) && (refpath[1] == L':') )
     {
@@ -142 +144 @@
     }
 
+    free(refcopy);
     /* or we had an empty residual path name, after the drive designator,
      * in which case we simply fall through ...

libmpc/trunk/win32/dirent.c

@@ -51 +51 @@
 
 #include <dirent.h>
-
-#include <unixem/unixem.h>
 
 #include <errno.h>

libmpc/trunk/win32/libgen.h

@@ -14 +14 @@
 #define _LIBGEN_H_
 
-/* All the headers include this file. */
-#include <_mingw.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-extern __cdecl __MINGW_NOTHROW char *basename (char *);
-extern __cdecl __MINGW_NOTHROW char *dirname  (char *);
+extern char *basename (char *);
 
 #ifdef __cplusplus