Imported Upstream version 2.7

[debian/cpmtools] / mkfs.cpm.c

diff --git a/mkfs.cpm.c b/mkfs.cpm.c
index e15c36d35c8cc39ebff68d493d46ec1333dee3d5..59a15428b3edc0b433abe9176e8ff2b90cd862b7 100644 (file)
--- a/mkfs.cpm.c
+++ b/mkfs.cpm.c
@@ -1,16 +1,18 @@
 /* #includes */ /*{{{C}}}*//*{{{*/
+#include "config.h"
+
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "config.h"
-
-extern char *optarg;
-extern int optind,opterr,optopt;
-int getopt(int argc, char * const *argv, const char *optstring);
 
+#include "getopt.h"
 #include "cpmfs.h"
+
+#ifdef USE_DMALLOC
+#include <dmalloc.h>
+#endif
 /*}}}*/
 /* #defines */ /*{{{*/
 #ifndef O_BINARY