Commits

Shlomi Fish committed c1d1a8c

Removed other references to the public domain.

config.h.orig was removed - I have no idea what it is and it does not seem
necessary.

git-svn-id: file:///home/shlomif/Backup/svn-dumps/google-code/svnsync-repos/fc-solve/trunk@1390 e7e8a897-7ba4-4ee7-b36f-f4c66519b19a

Comments (0)

Files changed (3)

fc-solve/source/README

 solves most layouts of Freecell, and similar Solitaire variants as
 well as those of Simple Simon.
 
-Freecell Solver is distributed under the public domain.
+Freecell Solver is distributed under the MIT/X11 License 
+( http://en.wikipedia.org/wiki/MIT_License ), a free, permissive, 
+public-domain like, open-source license.
 
 I hope you'll enjoy using it, and make the best of it.
 

fc-solve/source/config.h.dkds

+/* 
+ * Copyright (c) 2000 Shlomi Fish
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
 /*
     config.h - Configuration file for Freecell Solver
-
-    Written by Shlomi Fish, 2000
-
-    This file is distributed under the public domain.
-    (It is not copyrighted).
 */
 
 #ifndef __CONFIG_H

fc-solve/source/config.h.orig

-/*
-    config.h - Configuration file for Freecell Solver
-
-    Written by Shlomi Fish, 2000
-
-    This file is distributed under the public domain.
-    (It is not copyrighted).
-*/
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* #define DEBUG_STATES */
-#define COMPACT_STATES
-/* #define INDIRECT_STACK_STATES */
-
-/* #define DEBUG */
-
-/* #define CARD_DEBUG_PRES */
-
-/* Make sure one and only one of DEBUG_STATES and COMPACT_STATES is defined. 
- * The preferred is COMPACT_STATES because it occupies less memory and is 
- * faster.
- */
-#if (!defined(DEBUG_STATES)) && (!defined(COMPACT_STATES)) && (!defined(INDIRECT_STACK_STATES))
-#define COMPACT_STATES
-#elif defined(COMPACT_STATES) && defined(DEBUG_STATES)
-#undef DEBUG_STATES
-#endif
-
-
-/*
-    The sort margin size for the previous states array.
-*/
-#define PREV_STATES_SORT_MARGIN 32
-/*
-    The amount prev_states grow by each time it each resized.
-    Should be greater than 0 and in order for the program to be
-    efficient, should be much bigger than 
-    PREV_STATES_SORT_MARGIN.
-*/
-#define PREV_STATES_GROW_BY 128
-
-/*
-    The amount the pack pointers array grows by. Shouldn't be too high
-    because it doesn't happen too often.
-*/
-#define IA_STATE_PACKS_GROW_BY 32
-
-/*
- * The maximal number of Freecells. For efficiency's sake it should be a
- * multiple of 4.
- * */
-#define MAX_NUM_FREECELLS 4
-
-/*
- * The maximal number of Stacks. For efficiency's sake it should be a 
- * multiple of 4.
- * */
-#define MAX_NUM_STACKS 12
-
-
-/*
- * The maximal number of initial cards that can be found in a stack.
- * */
-#define MAX_NUM_INITIAL_CARDS_IN_A_STACK 7
-
-#define MAX_NUM_DECKS 2
-
-/* #define FCS_NON_DFS */
-
-    
-#define FCS_STATE_STORAGE_INDIRECT 0
-#define FCS_STATE_STORAGE_INTERNAL_HASH 1
-#define FCS_STATE_STORAGE_LIBAVL_AVL_TREE 2
-#define FCS_STATE_STORAGE_LIBAVL_REDBLACK_TREE 3
-#define FCS_STATE_STORAGE_LIBREDBLACK_TREE 4
-#define FCS_STATE_STORAGE_GLIB_TREE 5
-#define FCS_STATE_STORAGE_GLIB_HASH 6
-#define FCS_STATE_STORAGE_DB_FILE 7
-
-#define FCS_STACK_STORAGE_INTERNAL_HASH 0
-#define FCS_STACK_STORAGE_LIBAVL_AVL_TREE 1
-#define FCS_STACK_STORAGE_LIBAVL_REDBLACK_TREE 2
-#define FCS_STACK_STORAGE_LIBREDBLACK_TREE 3
-#define FCS_STACK_STORAGE_GLIB_TREE 4
-#define FCS_STACK_STORAGE_GLIB_HASH 5
-/* #define FCS_STACK_STORAGE FCS_STACK_STORAGE_INTERNAL_HASH */ 
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif