Changeset ae267366 for tests/include/includes.cfa

Timestamp:

Feb 24, 2023, 3:31:50 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

2e77837

Parents:

f883ef1 (diff), f2a1cd2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

fix merge conflict

File:

• tests/include/includes.cfa (modified) (5 diffs)

tests/include/includes.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 22 08:27:20 2022
-// Update Count     : 779
+// Last Modified On : Wed Feb 22 10:16:58 2023
+// Update Count     : 811
 //
 
@@ -72 +72 @@
 #include <gshadow.h>
 #include <iconv.h>
-#include <ifaddrs.h>
+//#include <ifaddrs.h>                                                                  // causes warning messages that break the build
 #include <inttypes.h>
 #include <langinfo.h>
@@ -97 +97 @@
 #include <ncurses_dll.h>                                                                // may not be installed, comes with ncurses
 #endif
-#include <netdb.h>
+//#include <netdb.h>
 #include <nl_types.h>
 #include <nss.h>
@@ -111 +111 @@
 #include <pwd.h>
 #include <regex.h>
-#include <resolv.h>
+//#include <resolv.h>
 #include <re_comp.h>
 #include <sched.h>
@@ -170 +170 @@
 #endif // __CFA__
 
-int main( int argc, char const * argv[] ) {
+int main() {
     #pragma GCC warning "Compiled"                                                      // force non-empty .expect file, NO TABS!!!
 }