Add public domain getopt implementation. SCL git c3f9ff5, dc302ea, and 2d26da7.

Nicholas Reed · Nicholas Reed · commit 89952aec17ab · 2012-06-07T15:40:40.000Z
diff --git a/include/express/basic.h b/include/express/basic.h
@@ -135,7 +135,7 @@ typedef int ( *intFuncptr )();
 #  define PROTO(x)  x
 # else
 
-# ifdef __CLCC__
+# if defined(__CLCC__) || defined(__MSVC__) || defined(__BORLAND__)
 # define PROTO(x)   x
 #else
 # define PROTO(x)   ()
diff --git a/include/express/dict.h b/include/express/dict.h
@@ -1,9 +1,7 @@
 #ifndef DICTIONARY_H
 #define DICTIONARY_H
 
-/* $Id: dict.h,v 1.4 1997/01/21 19:17:11 dar Exp $ */
-
-/************************************************************************
+/** **********************************************************************
 ** Module:  Dictionary
 ** Description: This module implements the dictionary abstraction.  A
 **  dictionary is a repository for a number of objects, all of which
@@ -52,7 +50,6 @@
 
 #include "hash.h"
 #include "error.h"
-#include "dict.h"
 
 /************/
 /* typedefs */
diff --git a/src/exppp/exppp.c b/src/exppp/exppp.c
@@ -571,7 +571,7 @@ SCOPEalgs_out( Scope s, int level ) {
 }
 
 static int
-min( int a, int b, int c ) {
+minimum( int a, int b, int c ) {
     if( a < b ) {
         return ( ( a < c ) ? a : c );
     } else {
@@ -606,7 +606,7 @@ static void copy_file_chunk( char * filename, int start, int end, int level ) {
     /* copy the rest */
     for( i = end - start; i--; ) {
         fgets( buff, 255, infile );
-        fix = min( undent, strlen( buff ), strspn( buff, " " ) );
+        fix = minimum( undent, strlen( buff ), strspn( buff, " " ) );
         raw( "%*s%s", indent + fix, "", buff + fix );
     }
 
diff --git a/src/express/fedex.c b/src/express/fedex.c
@@ -75,10 +75,16 @@ char * FEDEXversion( void ) {
     return( "V2.11.4-beta CADDETC preval June 8, 1995" );
 }
 
-#include <getopt.h>
+#include <scl_cf.h>
+#include <scl_export.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#ifndef HAVE_GETOPT
+# include "xgetopt.h"
+#endif
 #include "express/error.h"
 #include "express/express.h"
 #include "express/resolve.h"
diff --git a/src/fedex_plus/CMakeLists.txt b/src/fedex_plus/CMakeLists.txt
@@ -29,5 +29,13 @@ include_directories(
     ${SCL_SOURCE_DIR}/include/exppp
     ${SCL_SOURCE_DIR}/include/express
 )
+IF(MSVC OR BORLAND)
+set(fedex_plus_EXTRA_SOURCES
+    xgetopt.cc
+)
+add_definitions( -DSCL_EXPRESS_DLL_IMPORTS )
+add_definitions( -DSCL_EXPPP_DLL_IMPORTS )
+add_definitions( -DSCL_BASE_DLL_IMPORTS )
+ENDIF()
 
-SCL_ADDEXEC(fedex_plus "${fedex_plus_SOURCES}" "libexppp;express")
+SCL_ADDEXEC(fedex_plus "${fedex_plus_SOURCES}${fedex_plus_EXTRA_SOURCES}" "libexppp;express")
