Fix(?) "warning: implicit declaration of function mlock" for non-Wind…

…ows builds? git-svn-id: file:///home/jj/hercules.svn/trunk@7301 956126f8-22a0-4046-8f4a-272fa8102e63
kenx00 · Jan 27, 2011 · 5b46cfd · 5b46cfd
1 parent d55b2e6
commit 5b46cfd
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 50 deletions.
diff --git a/herclin.c b/herclin.c
@@ -18,23 +18,27 @@
 /* INTERFACE FEATURE.                           */
 /************************************************/
 
-#ifdef _MSVC_
-#include <windows.h>
-#include <conio.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "hextapi.h"
+#if 1 // fish test: we SHOULD be doing it this way! Why aren't we?!
 
-#if defined(HDL_USE_LIBTOOL)
+  #include "hstdinc.h"
+  #include "hercules.h"
 
-/* This must be included if HDL uses the   */
-/* libtool ltdl convenience library        */
+#else
 
-#include "ltdl.h"
-#endif
+  #ifdef _MSVC_
+  #include <windows.h>
+  #include <conio.h>
+  #endif
+  #ifdef HAVE_CONFIG_H
+    #include <config.h> // Hercules build configuration options/settings
+  #endif
+  #include <stdio.h>
+  #include <stdlib.h>
+  #include <string.h>
+  #include <sys/mman.h>
 
+#endif
+#include "hextapi.h"
 
 /**********************************************/
 /* The following function is the LOG callback */

diff --git a/hextapi.h b/hextapi.h
@@ -5,42 +5,19 @@
 /*   (http://www.hercules-390.org/herclic.html) as modifications to  */
 /*   Hercules.                                                       */
 
-/********************************************************/
-/* HEXTAPI.H : Definition of Hercules External (public) */
-/*             APIs                                     */
-/*  (c) Copyright 2005-2009 Roger Bowler & Others       */
-/*  This file originally written by Ivan Warren         */
-/*  THE STATE OF THIS API IS NOT YET FINALIZED          */
-/*  AND THEREFORE, THE INTERFACE MAY CHANGE             */
-/********************************************************/
-
 // $Id$
 
+/*
+        +-------------------------------------------------+
+        |   This file originally written by Ivan Warren   |
+        |   THE STATE OF THIS API IS NOT YET FINALIZED    |
+        |   AND THEREFORE, THE INTERFACE MAY CHANGE       |
+        +-------------------------------------------------+
+*/
 
 #ifndef _HEXTAPI_H_
 #define _HEXTAPI_H_
 
-#if defined(_MSVC_) && defined(HERC_DLL_BUILD)
-#define DLL_IMPORT __declspec(dllimport)
-#else
-#define DLL_IMPORT extern
-#endif
-
-typedef void (*LOGCALLBACK)(const char *,size_t);
-typedef void (*COMMANDHANDLER)(void *);
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-    /* LOG Callback */
-    DLL_IMPORT void registerLogCallback(LOGCALLBACK);
-    /* Panel Commands */
-    DLL_IMPORT COMMANDHANDLER getCommandHandler(void);
-    /* IMPL */
-    DLL_IMPORT int impl(int ac,char **av);
-#ifdef __cplusplus
-}
-#endif
+// ZZ FIXME: do we even NEED this header any longer?!
 
 #endif
diff --git a/hexterns.h b/hexterns.h
@@ -441,7 +441,7 @@ typedef void (*LOGCALLBACK)(const char *,size_t);
 typedef void *(*COMMANDHANDLER)(void *);
 
 IMPL_DLL_IMPORT int impl(int,char **);
-IMPL_DLL_IMPORT void regiserLogCallback(LOGCALLBACK);
+IMPL_DLL_IMPORT void registerLogCallback(LOGCALLBACK);
 IMPL_DLL_IMPORT COMMANDHANDLER getCommandHandler(void);
 
 /* Functions in module timer.c */

diff --git a/hstdinc.h b/hstdinc.h
@@ -76,6 +76,7 @@
 #if !defined(_MSVC_)
   #include <sys/time.h>
   #include <sys/ioctl.h>
+  #include <sys/mman.h>
 #endif
 #include <sys/types.h>
 
@@ -114,9 +115,6 @@
 #ifdef HAVE_SYS_IOCTL_H
   #include <sys/ioctl.h>
 #endif
-#ifdef HAVE_SYS_MMAN_H
-  #include <sys/mman.h>
-#endif
 #ifdef HAVE_SYS_PARAM_H
   #include <sys/param.h>
 #endif

diff --git a/msvc.makefile.includes/MOD_RULES1.msvc b/msvc.makefile.includes/MOD_RULES1.msvc
@@ -43,10 +43,10 @@ $(O)decNumber.res: decNumber\decNumber.rc
 # No precompiled headers for these ones.. Sorry!
 #
 $(O)getopt.obj: getopt.c
-    $(cc) $(cdebug) $(cflags) $(cvarsdll) /Fo"$(OBJDIR)\\" /Fd"$(OBJDIR)\\" getopt.c
+    $(cc) $(cdebug) $(cflags) /IdecNumber /I. $(cvarsdll) /Fo"$(OBJDIR)\\" /Fd"$(OBJDIR)\\" getopt.c
 
 $(O)herclin.obj: herclin.c
-    $(cc) $(cdebug) $(cflags) $(cvarsdll) /Fo"$(OBJDIR)\\" /Fd"$(OBJDIR)\\" herclin.c
+    $(cc) $(cdebug) $(cflags) /IdecNumber /I. $(cvarsdll) /Fo"$(OBJDIR)\\" /Fd"$(OBJDIR)\\" herclin.c
 
 # NOTE: to be safe, since this member contains build rules, we need to
 # make sure there's always a blank line following the last build rule