Merge remote-tracking branch 'upstream/master' into a5200

[cc65] / src / ca65 / incpath.h

diff --git a/src/ca65/incpath.h b/src/ca65/incpath.h
index 82cd0d2e29f6a538eecc6421eff4fc5c6c5d95cc..818e36265389c1ee45a942bd5d5613c41af31da8 100644 (file)
--- a/src/ca65/incpath.h
+++ b/src/ca65/incpath.h
@@ -1,12 +1,12 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                                incpath.h                                 */
+/*                                 incpath.h                                 */
 /*                                                                           */
-/*           Include path handling for the ca65 macro assembler             */
+/*            Include path handling for the ca65 macro assembler             */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000-2010, Ullrich von Bassewitz                                      */
+/* (C) 2000-2013, Ullrich von Bassewitz                                      */
 /*                Roemerstrasse 52                                           */
 /*                D-70794 Filderstadt                                        */
 /* EMail:         uz@cc65.org                                                */
@@ -38,42 +38,36 @@
 
 
 
+/* common */
+#include "searchpath.h"
+
+
+
 /*****************************************************************************/
-/*                                  Data                                    */
+/*                                   Data                                    */
 /*****************************************************************************/
 
 
 
-#define INC_STD         0x0001U         /* Add to standard include path */
-#define INC_BIN         0x0002U         /* Add to binary include path */
+extern SearchPaths*     IncSearchPath;          /* Standard include path */
+extern SearchPaths*     BinSearchPath;          /* Binary include path */
 
 
 
 /*****************************************************************************/
-/*                                          Code                                    */
+/*                                   Code                                    */
 /*****************************************************************************/
 
 
 
-void AddIncludePath (const char* NewPath, unsigned Where);
-/* Add a new include path to the existing one */
-
-char* FindInclude (const char* Name, unsigned Where);
-/* Find an include file. Return a pointer to a malloced area that contains
- * the complete path, if found, return 0 otherwise.
- */
-
-void ForgetAllIncludePaths (void);
-/* Remove all include search paths. */
-
 void InitIncludePaths (void);
 /* Initialize the include path search list */
 
+void FinishIncludePaths (void);
+/* Finish creating the include path search list. */
+
 
 
 /* End of incpath.h */
 
 #endif
-
-
-