--- hatari/src/debug/breakcond.h	2019/04/09 08:49:27	1.1.1.2
+++ hatari/src/debug/breakcond.h	2019/04/09 08:56:50	1.1.1.5
@@ -1,8 +1,8 @@
 /*
   Hatari - breakcond.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
 #ifndef HATARI_BREAKCOND_H
@@ -10,19 +10,15 @@
 
 /* for debugui.c */
 extern bool BreakCond_Save(const char *filename);
-extern char *BreakCond_MatchCpuVariable(const char *text, int state);
-extern char *BreakCond_MatchDspVariable(const char *text, int state);
-
-/* for evaluate.c */
-extern bool BreakCond_GetHatariVariable(const char *name, Uint32 *value);
 
 /* for debugcpu.c & debugdsp.c */
 extern const char BreakCond_Description[];
 extern const char BreakAddr_Description[];
 
-extern int BreakCond_MatchCpu(void);
-extern int BreakCond_MatchDsp(void);
-extern int BreakCond_BreakPointCount(bool bForDsp);
+extern bool BreakCond_MatchCpu(void);
+extern bool BreakCond_MatchDsp(void);
+extern int BreakCond_CpuBreakPointCount(void);
+extern int BreakCond_DspBreakPointCount(void);
 extern bool BreakCond_Command(const char *expression, bool bForDsp);
 extern bool BreakAddr_Command(char *expression, bool bforDsp);