fix merge conflict

Author: dhthwy

library/include/modules/DFSDL.h

@@ -42,6 +42,7 @@ namespace DFHack::DFSDL
         */
     void cleanup();
 
+    DFHACK_EXPORT void * lookup_DFSDL_Symbol(const char *name);
     DFHACK_EXPORT SDL_Surface* DFIMG_Load(const char* file);
     DFHACK_EXPORT SDL_Surface* DFSDL_CreateRGBSurface(uint32_t flags, int width, int height, int depth, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask);
     DFHACK_EXPORT SDL_Surface* DFSDL_CreateRGBSurfaceFrom(void* pixels, int width, int height, int depth, int pitch, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask);
@@ -73,39 +74,8 @@ namespace DFHack
     DFHACK_EXPORT std::string getClipboardTextCp437();
     DFHACK_EXPORT bool setClipboardTextCp437(std::string text);
 
-/**
- * Call this when DFHack is being unloaded.
- */
-void cleanup();
-
-DFHACK_EXPORT void * lookup_DFSDL_Symbol(const char *name);
-DFHACK_EXPORT SDL_Surface * DFIMG_Load(const char *file);
-DFHACK_EXPORT SDL_Surface * DFSDL_CreateRGBSurface(uint32_t flags, int width, int height, int depth, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask);
-DFHACK_EXPORT SDL_Surface * DFSDL_CreateRGBSurfaceFrom(void *pixels, int width, int height, int depth, int pitch, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask);
-DFHACK_EXPORT int DFSDL_UpperBlit(SDL_Surface *src, const SDL_Rect *srcrect, SDL_Surface *dst, SDL_Rect *dstrect);
-DFHACK_EXPORT SDL_Surface * DFSDL_ConvertSurface(SDL_Surface *src, const SDL_PixelFormat *fmt, uint32_t flags);
-DFHACK_EXPORT void DFSDL_FreeSurface(SDL_Surface *surface);
-// DFHACK_EXPORT int DFSDL_SemWait(SDL_sem *sem);
-// DFHACK_EXPORT int DFSDL_SemPost(SDL_sem *sem);
-DFHACK_EXPORT int DFSDL_PushEvent(SDL_Event *event);
-DFHACK_EXPORT void DFSDL_free(void *ptr);
-DFHACK_EXPORT SDL_PixelFormat* DFSDL_AllocFormat(uint32_t pixel_format);
-DFHACK_EXPORT SDL_Surface* DFSDL_CreateRGBSurfaceWithFormat(uint32_t flags, int width, int height, int depth, uint32_t format);
-DFHACK_EXPORT int DFSDL_ShowSimpleMessageBox(uint32_t flags, const char *title, const char *message, SDL_Window *window);
-
-// submitted and returned text is UTF-8
-// see wrapper functions below for cp-437 variants
-DFHACK_EXPORT char * DFSDL_GetClipboardText();
-DFHACK_EXPORT int DFSDL_SetClipboardText(const char *text);
-
-}
-
-// System clipboard -- submitted and returned text must be in CP437
-DFHACK_EXPORT std::string getClipboardTextCp437();
-DFHACK_EXPORT bool setClipboardTextCp437(std::string text);
-
-// interprets 0xa as newline instead of usual CP437 char
-DFHACK_EXPORT bool getClipboardTextCp437Multiline(std::vector<std::string> * lines);
-DFHACK_EXPORT bool setClipboardTextCp437Multiline(std::string text);
+    // interprets 0xa as newline instead of usual CP437 char
+    DFHACK_EXPORT bool getClipboardTextCp437Multiline(std::vector<std::string> * lines);
+    DFHACK_EXPORT bool setClipboardTextCp437Multiline(std::string text);
 
 }