diff options
| -rw-r--r-- | chalk/plugins/filters/cimg/CImg.h | 4 | ||||
| -rw-r--r-- | kexi/kexidb/parser/sqlparser.cpp | 4 | ||||
| -rw-r--r-- | kexi/kexidb/parser/sqlscanner.cpp | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/chalk/plugins/filters/cimg/CImg.h b/chalk/plugins/filters/cimg/CImg.h index 23c7e221..315d1fe3 100644 --- a/chalk/plugins/filters/cimg/CImg.h +++ b/chalk/plugins/filters/cimg/CImg.h @@ -4059,7 +4059,7 @@ namespace cimg_library { XSendEvent(cimg::X11attr().display, window, False, 0, &event); pthread_mutex_unlock(cimg::X11attr().mutex); } else { -#if cimg_use_xshm +#ifdef cimg_use_xshm if (shminfo) XShmPutImage(cimg::X11attr().display,window,*cimg::X11attr().gc,image,0,0,0,0,width,height,False); else @@ -4157,7 +4157,7 @@ namespace cimg_library { if (fullscreen) XUngrabKeyboard(cimg::X11attr().display,CurrentTime); XDestroyWindow(cimg::X11attr().display,window); if (shminfo) { -#if cimg_use_xshm +#ifdef cimg_use_xshm XShmDetach(cimg::X11attr().display, shminfo); XDestroyImage(image); shmdt(shminfo->shmaddr); diff --git a/kexi/kexidb/parser/sqlparser.cpp b/kexi/kexidb/parser/sqlparser.cpp index c3d2f53d..097deb3b 100644 --- a/kexi/kexidb/parser/sqlparser.cpp +++ b/kexi/kexidb/parser/sqlparser.cpp @@ -942,7 +942,7 @@ typedef short int yytype_int16; #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if YYENABLE_NLS +# ifdef YYENABLE_NLS # if ENABLE_NLS # include <libintl.h> /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -1663,7 +1663,7 @@ while (YYID (0)) we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL +# ifdef YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ (Loc).first_line, (Loc).first_column, \ diff --git a/kexi/kexidb/parser/sqlscanner.cpp b/kexi/kexidb/parser/sqlscanner.cpp index f59b5096..75ee2535 100644 --- a/kexi/kexidb/parser/sqlscanner.cpp +++ b/kexi/kexidb/parser/sqlscanner.cpp @@ -554,7 +554,7 @@ static int input YY_PROTO(( void )); #endif #endif -#if YY_STACK_USED +#ifdef YY_STACK_USED static int yy_start_stack_ptr = 0; static int yy_start_stack_depth = 0; static int *yy_start_stack = 0; @@ -1738,10 +1738,10 @@ FILE *file; b->yy_input_file = file; b->yy_fill_buffer = 1; -#if YY_ALWAYS_INTERACTIVE +#ifdef YY_ALWAYS_INTERACTIVE b->yy_is_interactive = 1; #else -#if YY_NEVER_INTERACTIVE +#ifdef YY_NEVER_INTERACTIVE b->yy_is_interactive = 0; #else b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; @@ -2032,7 +2032,7 @@ void *ptr; free( ptr ); } -#if YY_MAIN +#ifdef YY_MAIN int main() { yylex(); |